Michal Sciubidlo
|
f7e5ea24f4
|
Merge branch 'startup' into cs_load.
Fix include in textinputdialog.cpp.
|
2013-02-05 21:23:49 +01:00 |
|
Michal Sciubidlo
|
66ec4ca7d9
|
Split launcher specific code from DataFilesList back to DataFilesPage.
|
2013-02-04 22:14:14 +01:00 |
|
Marc Zinnschlag
|
ba0d13fc12
|
moved code for creating new base content records into the Document class
|
2013-02-04 13:50:38 +01:00 |
|
Marc Zinnschlag
|
4c973a0f67
|
constructing documents from a file list instead of a single name
|
2013-02-04 13:46:54 +01:00 |
|
Marc Zinnschlag
|
3f0a49a2f6
|
Merge branch 'master' into startup
Conflicts:
apps/opencs/CMakeLists.txt
|
2013-02-04 10:22:37 +01:00 |
|
Marc Zinnschlag
|
a002b253d1
|
silenced a cmake warning
|
2013-02-03 16:18:17 +01:00 |
|
Marc Zinnschlag
|
a4872e3217
|
rewrote the opencs cmake scripts (more compact and no more annoying warnings)
|
2013-02-03 13:30:40 +01:00 |
|
Marc Zinnschlag
|
d6a73a2a02
|
updated changelog
|
2013-02-03 11:41:31 +01:00 |
|
Michal Sciubidlo
|
155cca0c9a
|
Upload missing files.
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
|
2013-02-02 18:36:01 +01:00 |
|
Marc Zinnschlag
|
67a1ec5166
|
added provisional startup dialogue
|
2013-02-02 16:14:58 +01:00 |
|
Marc Zinnschlag
|
827261e8b4
|
increased version number
|
2013-02-02 13:42:11 +01:00 |
|
Marc Zinnschlag
|
85697e4628
|
reverted to C++03
|
2013-02-02 13:24:28 +01:00 |
|
Nathan Jeffords
|
4e46f403a9
|
added some more warning to ignore in MSVC
|
2013-02-01 21:02:24 -08:00 |
|
Michal Sciubidlo
|
492482de7f
|
Add "open" option in opencs.
|
2013-02-01 00:42:03 +01:00 |
|
Michal Sciubidlo
|
ac62dd050d
|
Rename datafilespage to datafileslist
|
2013-01-30 21:08:27 +01:00 |
|
Michal Sciubidlo
|
f029a9011a
|
Move datafilespage to shared space.
|
2013-01-30 20:21:03 +01:00 |
|
Emanuel Guevel
|
19dff822f4
|
Dialogue: do not filter on disposition for creatures
|
2013-01-24 19:43:21 +01:00 |
|
Emanuel Guevel
|
ed9a9904b4
|
Dialogue filter: search script variables case-insensitively
|
2013-01-24 19:39:31 +01:00 |
|
scrawl
|
cac68c9e87
|
Removed an outdated section from CMakeLists
|
2013-01-23 11:48:47 +01:00 |
|
Marc Zinnschlag
|
90d05858ef
|
disabling dialogue sub-views for now
|
2013-01-22 11:50:08 +01:00 |
|
Marc Zinnschlag
|
cd662af634
|
Merge branch 'globals'
|
2013-01-22 11:47:24 +01:00 |
|
Marc Zinnschlag
|
2756d3ee94
|
Merge remote-tracking branch 'wheybags/containerscripts'
|
2013-01-21 23:02:45 +01:00 |
|
Tom Mason
|
f5f3c2e62d
|
enabling / disabling should not affect scripts
|
2013-01-21 20:06:08 +00:00 |
|
Tom Mason
|
31c71c029d
|
objects with scripts attached, that are inside containers will behave correctly when the container is moved
|
2013-01-20 17:01:30 +00:00 |
|
Emanuel Guevel
|
af9e126487
|
Add unicode number for ellipsis (…) to code range
|
2013-01-20 17:50:32 +01:00 |
|
Emanuel Guevel
|
736e471613
|
Print a fallback text when no topic response is found
|
2013-01-20 17:44:09 +01:00 |
|
Emanuel Guevel
|
43e85ea0c6
|
Disallow redirection to info refusal for greetings
|
2013-01-20 17:44:09 +01:00 |
|
Emanuel Guevel
|
05796d85a4
|
NPC: take stats from NPDT12 into account
Some available stats (level, reputation and disposition) were not used
for NPC with auto-calculated stats.
|
2013-01-20 17:44:08 +01:00 |
|
Emanuel Guevel
|
951eb1b236
|
Dialogue: return a response from "Info Refusal" when disposition is not satisfied
|
2013-01-20 17:44:08 +01:00 |
|
Tom Mason
|
23dada0ee4
|
moved script handling on enable / disable into their own functions
|
2013-01-20 16:38:56 +00:00 |
|
Tom Mason
|
28c580d280
|
disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly
|
2013-01-20 15:43:52 +00:00 |
|
Tom Mason
|
bbac63bff7
|
Ignore vim swap files
|
2013-01-20 14:25:44 +00:00 |
|
Tom Mason
|
abe25c5f66
|
removed use of c++11 auto
|
2013-01-20 14:24:55 +00:00 |
|
Tom Mason
|
665a530e10
|
renamed realAdd to addImp
|
2013-01-20 14:14:34 +00:00 |
|
Tom Mason
|
3c6ddd7fa7
|
fixed isInCell method
|
2013-01-20 14:10:04 +00:00 |
|
Nathan Jeffords
|
f55da17933
|
made some journal accessor methods constant
|
2013-01-19 16:21:41 -08:00 |
|
Nathan Jeffords
|
4c7ae3d1ff
|
prevent duplicate journal entries from being recorded
|
2013-01-19 16:21:15 -08:00 |
|
Nathan Jeffords
|
528c3da6da
|
record heard topics in journal
|
2013-01-19 16:20:22 -08:00 |
|
Nathan Jeffords
|
d6b956cdcf
|
fixed swapped day & month fields when created a stamped journal entry
|
2013-01-19 16:19:03 -08:00 |
|
Marc Zinnschlag
|
2d96f52864
|
select correct record when opening a dialogue sub view
|
2013-01-19 14:29:14 +01:00 |
|
Marc Zinnschlag
|
82b790770d
|
Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'
|
2013-01-17 10:21:01 +01:00 |
|
Emanuel Guevel
|
4feaa66897
|
Do not open the dialogue window if no greeting is found
|
2013-01-17 01:58:44 +01:00 |
|
pvdk
|
4c0e0fc279
|
Modified license filename of the DejaVu font, more similar to the other one now
|
2013-01-17 01:30:15 +01:00 |
|
Marc Zinnschlag
|
7b568cbb15
|
Merge remote-tracking branch 'potatoesmaster/dialogue'
|
2013-01-16 22:03:40 +01:00 |
|
Marc Zinnschlag
|
312f68bf9c
|
Merge remote-tracking branch 'thoronador/fix-spelling'
|
2013-01-16 12:28:33 +01:00 |
|
Thoronador
|
3220330ce0
|
fix spelling in comment
|
2013-01-16 04:19:16 +01:00 |
|
Chris Robinson
|
e5f040a06f
|
Improve filename pattern matching
|
2013-01-15 14:10:52 -08:00 |
|
Emanuel Guevel
|
9e00c6694f
|
Allow only ID filtered topics for dialogue with creatures
|
2013-01-15 21:40:44 +01:00 |
|
Chris Robinson
|
8a073c113e
|
Use const references where appropriate
|
2013-01-15 12:07:15 -08:00 |
|
Chris Robinson
|
8361192b64
|
Use typedefs for some maps and some cleanup
|
2013-01-15 11:10:41 -08:00 |
|