Commit graph

6970 commits

Author SHA1 Message Date
Marc Zinnschlag
07d20a2013 camera panning via left button drag 2014-02-25 14:09:07 +01:00
Marc Zinnschlag
b9107addc0 mouse wheel zooming 2014-02-25 13:39:49 +01:00
Marc Zinnschlag
b6ae521aa5 moving the camera with A and D keys 2014-02-25 13:31:15 +01:00
Marc Zinnschlag
af50575259 use shift key to speed up camera movement 2014-02-25 13:17:15 +01:00
Marc Zinnschlag
8081c067a6 moving the camera with W and S keys 2014-02-25 13:09:37 +01:00
Marc Zinnschlag
4ec4599be3 added navigation mode enum to SceneWidget 2014-02-25 12:30:45 +01:00
Marc Zinnschlag
6ec86564d1 re-enabled OGRE in OpenCS; cleaned up startup 2014-02-25 11:58:32 +01:00
cc9cii
5b48ca114f aicombat pathfinding fix - check the correct list 2014-02-25 08:31:14 +01:00
cc9cii
85c467f00f Minor cleanup for aicombat pathfinding workaround. 2014-02-25 08:30:52 +01:00
Nikolay Kasyanov
76c1d60d23 Fixed OpenCS build on OS X 2014-02-24 15:59:05 +01:00
Marc Zinnschlag
c62a352956 Merge branch 'cellstore' 2014-02-24 10:03:13 +01:00
Marc Zinnschlag
9b18e01507 keep track of which cells have state that needs to be saved 2014-02-24 10:03:04 +01:00
Marc Zinnschlag
bfcd768078 various bits of cleanup 2014-02-23 21:39:18 +01:00
Marc Zinnschlag
83ded18af0 encapsulated reference collections 2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
f220867144 make Ptr a bit more pointer-like 2014-02-23 18:17:41 +01:00
Marc Zinnschlag
b72c1c2c58 encapsulated water level 2014-02-23 17:34:18 +01:00
Marc Zinnschlag
79e723ad06 encapsulated mIds 2014-02-23 16:46:07 +01:00
Marc Zinnschlag
8ea686c6c8 encapsulated mState 2014-02-23 14:26:36 +01:00
cc9cii
1bd2664cb0 aicombat pathfinding workaround 2014-02-23 11:47:25 +01:00
cc9cii
1ab5948f19 merge upstream changes 2014-02-23 19:11:37 +11:00
Marc Zinnschlag
b0ae5b8ab7 Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29 2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb Revert "Allow MinGW64 compilation in Windows/msys"
This reverts commit c3f350e3fb.

Conflicts:
	libs/platform/string.h
2014-02-22 23:45:13 +11:00
cc9cii
ac606a865c Back out unnecessary change. 2014-02-22 23:22:23 +11:00
cc9cii
c241405d91 Fix Windows save & load. 2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb Allow MinGW64 compilation in Windows/msys 2014-02-22 12:06:50 +11:00
Nikolay Kasyanov
59508e914f Fixed OpenCS build on OS X 2014-02-22 01:17:58 +04:00
Marek Kochanowicz
e348c6baa9 accept drops from filters table. Cool. ☺ 2014-02-21 13:50:59 +01:00
Marek Kochanowicz
e2dce53543 additional check on droping to prevent exception 2014-02-21 12:55:01 +01:00
Marek Kochanowicz
fcf17805a0 Installing basic event filter 2014-02-21 12:48:39 +01:00
Marc Zinnschlag
7693f712bc started making CellStore into a proper class; encapsulated mCell member 2014-02-21 11:35:46 +01:00
Marek Kochanowicz
55e9083570 refactorisation 2014-02-21 10:27:23 +01:00
Marek Kochanowicz
1c35a85adf fixed bugs, added extra display_type 2014-02-20 19:27:51 +01:00
Marek Kochanowicz
7dff34ebf1 Features implemented. Time to debug. 2014-02-20 19:15:09 +01:00
Marek Kochanowicz
3ad6df1f92 try with the passing action 2014-02-20 17:54:18 +01:00
Marek Kochanowicz
38a86b5015 We can handle droping multiple records 2014-02-20 16:01:54 +01:00
Marek Kochanowicz
b788ab8b4c correcting 2014-02-20 14:10:03 +01:00
Marek Kochanowicz
4fe21dc38f Const correctness 2014-02-20 12:43:09 +01:00
Marc Zinnschlag
736644de05 Revert "#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()"
This reverts commit 51fb9f65ea.
2014-02-20 12:31:40 +01:00
Marek Kochanowicz
eb3cbaa4e1 Create filter on droping record. 2014-02-20 12:25:47 +01:00
Marek Kochanowicz
c7b3e139aa Propagate signal to the edit widget 2014-02-20 11:07:04 +01:00
Marek Kochanowicz
fca7701359 Column titles retrived and passed to the filterbox. 2014-02-19 16:15:51 +01:00
pvdk
b43325119a Some changes to the version retrieval: ignore shallow clones 2014-02-19 14:19:08 +01:00
Marek Kochanowicz
d7a1abb30b emit signal with types (will be connected to the tablesubview) 2014-02-19 12:55:39 +01:00
Marek Kochanowicz
dd95ed8e4c Accept drops on the filterbox 2014-02-19 12:32:48 +01:00
Marek Kochanowicz
569533eeae Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop 2014-02-19 11:23:53 +01:00
scrawl
d25b3ad9cb Fix AiCombat for creatures with weapons 2014-02-19 11:23:03 +01:00
scrawl
ebc67a82cf Don't list unnamed quests in the quest book 2014-02-19 11:23:03 +01:00
scrawl
1fba5d1bb9 Terrain: change world bounds from AABB to 4 floats 2014-02-19 11:23:03 +01:00
scrawl
bc376e6649 Closes #888: Treat "Bip 01" as animation root if existing 2014-02-19 11:23:03 +01:00
scrawl
439018e706 Get rid of useless return values 2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc Moved includes to appropriate place 2014-02-19 11:23:03 +01:00
Marek Kochanowicz
e9664d80bd make convert enumns public static 2014-02-19 11:22:47 +01:00
Marc Zinnschlag
550e5eb686 Merge remote-tracking branch 'corristo/osx-music-fix' 2014-02-18 09:12:02 +01:00
Marc Zinnschlag
ea16f79d77 Merge remote-tracking branch 'gus/AIFix2' 2014-02-17 10:54:07 +01:00
gus
84959eea28 woops, thanks scrawl 2014-02-17 10:50:10 +01:00
gus
6e1425321b remove cout spam 2014-02-17 10:43:09 +01:00
gus
e5b19cf3c6 clean up 2014-02-17 10:37:11 +01:00
Marc Zinnschlag
02c6c65705 Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-17 09:55:50 +01:00
Marek Kochanowicz
2bb9e47507 Improvements. 2014-02-17 08:58:55 +01:00
Nikolay Kasyanov
51fb9f65ea #1041 in progress: decode first sample batch right in OpenAL_SoundStream::play() 2014-02-17 02:59:23 +04:00
Nikolay Kasyanov
5e8cb2e466 Another attempt to fix #1041. This time I'm sending real data from decoder
once after playback started.
2014-02-17 02:35:13 +04:00
Marek Kochanowicz
e1a0f60041 allow _foo ids without qoute 2014-02-16 20:26:22 +01:00
Marek Kochanowicz
b83817e05e May only include alphanumeric characters and underscores and may not start with a number. 2014-02-16 20:18:28 +01:00
Marek Kochanowicz
3cc23a9cb3 very basic, but safe putting down " " 2014-02-16 18:41:42 +01:00
Nikolay Kasyanov
4e28fd85a3 Fixed build on OS X 2014-02-16 20:22:46 +04:00
Marc Zinnschlag
c18c3e51ee handle IDs that don't exist anymore after loading 2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9 partially store creature state in saved game files (only attributes and dynamics for now) 2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85 store NPC state in saved game files 2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144 store list of known topics in saved game files 2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15 Merge branch 'script'
Conflicts:
	readme.txt
2014-02-16 12:12:56 +01:00
Marek Kochanowicz
17af865a9f checking for the source of the drop, reject those from other files for now 2014-02-16 09:51:33 +01:00
Marc Zinnschlag
9cdfca6c26 Merge remote-tracking branch 'potatoesmaster/disable-crash' 2014-02-15 22:55:00 +01:00
Marek Kochanowicz
cbe1fe2f95 removed misplaced bracket 2014-02-15 22:38:59 +01:00
Marek Kochanowicz
45d9364195 Put the id in the quote. 2014-02-15 22:14:27 +01:00
Marek Kochanowicz
ec8c8a9d88 -journalinfo +topic 2014-02-15 22:05:42 +01:00
Marek Kochanowicz
41606a67e4 implemented whitelist of allowed types in the scripts 2014-02-15 20:49:09 +01:00
Marek Kochanowicz
930b77e60a allow drag and drop into the script edit window. 2014-02-15 19:52:40 +01:00
Marc Zinnschlag
01a7918124 Merge remote-tracking branch 'potatoesmaster/selected-spell' 2014-02-15 18:38:10 +01:00
Marek Kochanowicz
97fe5465bf created new files 2014-02-15 17:55:18 +01:00
Emanuel Guevel
3d8ca02479 Fix breaking of enchanted items casting 2014-02-15 17:39:57 +01:00
Marc Zinnschlag
0afa61eed5 fixed referenceable-loading in case of more than one content file 2014-02-15 15:50:17 +01:00
Marc Zinnschlag
2007a3e902 improved script check error messages 2014-02-15 13:25:38 +01:00
Marek Kochanowicz
56be62b956 small reformatting 2014-02-15 13:23:51 +01:00
Marek Kochanowicz
4ee90c24e5 more readable code. 2014-02-15 13:22:14 +01:00
Marc Zinnschlag
4e04131957 fixing case broke sorting in script context 2014-02-15 13:09:43 +01:00
Marc Zinnschlag
2130ec39d6 disable warnings by default in script verifier 2014-02-15 12:58:34 +01:00
Marek Kochanowicz
b1f63947e8 Checking if the drop comes from same document. 2014-02-15 12:40:07 +01:00
Marek Kochanowicz
d6820b977e store const ref to the document in the table. 2014-02-15 12:22:32 +01:00
Marek Kochanowicz
f3dc45f1ec long line split. 2014-02-14 15:29:10 +01:00
Marek Kochanowicz
37d262b147 Splited very long line. 2014-02-14 15:12:34 +01:00
Marc Zinnschlag
7b8802588e Merge remote-tracking branch 'sirherrbatka/DragDrop' 2014-02-14 14:28:30 +01:00
Marek Kochanowicz
aafde926d3 Documentation, corrections. 2014-02-14 14:04:36 +01:00
Marc Zinnschlag
e17af4231a added script verifier 2014-02-14 13:38:30 +01:00
Marc Zinnschlag
0ff744c2ff fixed CSMWorld::ScriptContext::isJournalId 2014-02-14 12:56:05 +01:00
gus
a315d5cc2b aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp 2014-02-14 12:55:14 +01:00
Marek Kochanowicz
ae418f2538 nicer formatting 2014-02-14 12:51:50 +01:00
Marc Zinnschlag
0a8ffbfb1d added missing implementation for CSMWorld::ScriptContext::getMemberType 2014-02-14 12:46:54 +01:00
Marc Zinnschlag
910d62e4b8 added missing implementation for CSMWorld::ScriptContext::getGlobalType 2014-02-14 11:59:33 +01:00
Marc Zinnschlag
451e1f413b instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly 2014-02-14 11:15:16 +01:00