pvdk
|
e8170adde5
|
Some minor changes, implemented suggestions
|
11 years ago |
pvdk
|
ceb66d0790
|
Also install the separate Sounds directory for Tribunal
|
11 years ago |
pvdk
|
5024f1bf77
|
Added a warning when trying to install tribunal after bloodmoon
|
11 years ago |
pvdk
|
2ccf4d6112
|
Post-merge cleanups, using confignmanager for XDG paths now, thanks scrawl!
|
11 years ago |
pvdk
|
c54217d008
|
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
CMakeLists.txt
components/CMakeLists.txt
components/config/gamesettings.cpp
|
11 years ago |
Marc Zinnschlag
|
550e5eb686
|
Merge remote-tracking branch 'corristo/osx-music-fix'
|
11 years ago |
Marc Zinnschlag
|
ea16f79d77
|
Merge remote-tracking branch 'gus/AIFix2'
|
11 years ago |
gus
|
84959eea28
|
woops, thanks scrawl
|
11 years ago |
gus
|
6e1425321b
|
remove cout spam
|
11 years ago |
gus
|
e5b19cf3c6
|
clean up
|
11 years ago |
Marc Zinnschlag
|
02c6c65705
|
Merge remote-tracking branch 'sirherrbatka/DragDrop'
|
11 years ago |
Marek Kochanowicz
|
2bb9e47507
|
Improvements.
|
11 years ago |
Nikolay Kasyanov
|
51fb9f65ea
|
#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()
|
11 years ago |
Nikolay Kasyanov
|
5e8cb2e466
|
Another attempt to fix #1041. This time I'm sending real data from decoder
once after playback started.
|
11 years ago |
Marek Kochanowicz
|
e1a0f60041
|
allow _foo ids without qoute
|
11 years ago |
Marek Kochanowicz
|
b83817e05e
|
May only include alphanumeric characters and underscores and may not start with a number.
|
11 years ago |
Marek Kochanowicz
|
3cc23a9cb3
|
very basic, but safe putting down " "
|
11 years ago |
Nikolay Kasyanov
|
4e28fd85a3
|
Fixed build on OS X
|
11 years ago |
Marc Zinnschlag
|
44f6f79bf5
|
Merge remote-tracking branch 'corristo/osx-ogre-19'
|
11 years ago |
Marc Zinnschlag
|
c18c3e51ee
|
handle IDs that don't exist anymore after loading
|
11 years ago |
Nikolay Kasyanov
|
4a61868521
|
OS X: fixed Ogre plugin packaging
|
11 years ago |
Marc Zinnschlag
|
9788bbcab9
|
partially store creature state in saved game files (only attributes and dynamics for now)
|
11 years ago |
Marc Zinnschlag
|
b0532e0c85
|
store NPC state in saved game files
|
11 years ago |
Marc Zinnschlag
|
9f721fd144
|
store list of known topics in saved game files
|
11 years ago |
Marc Zinnschlag
|
6ac64bbe15
|
Merge branch 'script'
Conflicts:
readme.txt
|
11 years ago |
Nikolay Kasyanov
|
e4017b8bfe
|
It seems that OctreeSceneManager is not required anymore
|
11 years ago |
Nikolay Kasyanov
|
8f99da084b
|
OS X: plugins are now in Frameworks dir, not in Plugins
|
11 years ago |
Nikolay Kasyanov
|
3c281c6a62
|
OS X: specify path to framework binary, not to framework directory
|
11 years ago |
Marek Kochanowicz
|
17af865a9f
|
checking for the source of the drop, reject those from other files for now
|
11 years ago |
Marc Zinnschlag
|
9cdfca6c26
|
Merge remote-tracking branch 'potatoesmaster/disable-crash'
|
11 years ago |
Marek Kochanowicz
|
cbe1fe2f95
|
removed misplaced bracket
|
11 years ago |
Marek Kochanowicz
|
45d9364195
|
Put the id in the quote.
|
11 years ago |
Marek Kochanowicz
|
ec8c8a9d88
|
-journalinfo +topic
|
11 years ago |
Marek Kochanowicz
|
41606a67e4
|
implemented whitelist of allowed types in the scripts
|
11 years ago |
Marek Kochanowicz
|
930b77e60a
|
allow drag and drop into the script edit window.
|
11 years ago |
Marc Zinnschlag
|
01a7918124
|
Merge remote-tracking branch 'potatoesmaster/selected-spell'
|
11 years ago |
Marek Kochanowicz
|
97fe5465bf
|
created new files
|
11 years ago |
Emanuel Guevel
|
3d8ca02479
|
Fix breaking of enchanted items casting
|
11 years ago |
Marc Zinnschlag
|
0afa61eed5
|
fixed referenceable-loading in case of more than one content file
|
11 years ago |
Marc Zinnschlag
|
2007a3e902
|
improved script check error messages
|
11 years ago |
Marek Kochanowicz
|
56be62b956
|
small reformatting
|
11 years ago |
Marek Kochanowicz
|
4ee90c24e5
|
more readable code.
|
11 years ago |
Marc Zinnschlag
|
4e04131957
|
fixing case broke sorting in script context
|
11 years ago |
Marc Zinnschlag
|
2130ec39d6
|
disable warnings by default in script verifier
|
11 years ago |
Marc Zinnschlag
|
0d84adb2c6
|
allow x->(y) instead of (x->y)
|
11 years ago |
Marc Zinnschlag
|
fd665a1994
|
ignore conditions after an else (only works if condition is put in parentheses)
|
11 years ago |
Marek Kochanowicz
|
b1f63947e8
|
Checking if the drop comes from same document.
|
11 years ago |
Marek Kochanowicz
|
d6820b977e
|
store const ref to the document in the table.
|
11 years ago |
Marek Kochanowicz
|
f3dc45f1ec
|
long line split.
|
11 years ago |
Marek Kochanowicz
|
37d262b147
|
Splited very long line.
|
11 years ago |