Commit Graph

9508 Commits (ae5f783a1650b8d65a2b65eeae149ab5729ef473)
 

Author SHA1 Message Date
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
Marek Kochanowicz fca7701359 Column titles retrived and passed to the filterbox. 11 years ago
pvdk c0631187c6 Removed git tag retrieval for Travis 11 years ago
pvdk 56d537e23d Added some sanity checking: compare git version with manual version 11 years ago
pvdk b43325119a Some changes to the version retrieval: ignore shallow clones 11 years ago
pvdk 85b7240948 Made the git version retrieval more reliable 11 years ago
Marek Kochanowicz d7a1abb30b emit signal with types (will be connected to the tablesubview) 11 years ago
Marek Kochanowicz dd95ed8e4c Accept drops on the filterbox 11 years ago
Marek Kochanowicz 569533eeae Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 11 years ago
scrawl d25b3ad9cb Fix AiCombat for creatures with weapons 11 years ago
scrawl ebc67a82cf Don't list unnamed quests in the quest book 11 years ago
scrawl 1fba5d1bb9 Terrain: change world bounds from AABB to 4 floats 11 years ago
scrawl bc376e6649 Closes #888: Treat "Bip 01" as animation root if existing 11 years ago
scrawl 439018e706 Get rid of useless return values 11 years ago
scrawl 90f6cda4cc Moved includes to appropriate place 11 years ago
scrawl ae5d25ac58 FindSDL.cmake is unused 11 years ago
Marek Kochanowicz e9664d80bd make convert enumns public static 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