teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
5374 commits 34 branches 0 tags 66 MiB
Commit graph

5374 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
92f70635a2 improved selection behaviour 2012-11-27 10:42:46 +01:00
scrawl
d6dd212ce8 GetWerewolfKills, ModScale, SetDelete, GetSquareRoot 2012-11-27 06:54:13 +01:00
Marc Zinnschlag
ef9575498f basic (non-editable) subview for global variables 2012-11-26 12:29:22 +01:00
Mark Siewert
b103426cf0 - Partially reimplement deleting objects defined in a parent esX file. 
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
 2012-11-25 19:07:16 +01:00
Mark Siewert
896ab44d1e - Add some updated files missing from last commit. 
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
 2012-11-25 17:19:29 +01:00
Mark Siewert
8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
 2012-11-25 14:12:44 +01:00
Marc Zinnschlag
1dd63e9fb6 Merge branch 'master' into editor2 2012-11-25 10:50:34 +01:00
scrawl
1ccad32877 GetWeaponType 2012-11-25 02:06:43 +01:00
scrawl
e68dc19256 GetCurrentTime, HasSoulGem 2012-11-25 01:54:37 +01:00
scrawl
0db48b29c7 GetSpellEffects, GetRace 2012-11-25 01:26:29 +01:00
scrawl
4b830e5c7a Merge branch 'scripting' of github.com:scrawl/openmw into scripting 2012-11-25 00:44:38 +01:00
Marc Zinnschlag
eece4226c0 basic sub view system (very incomplete) 2012-11-24 13:30:43 +01:00
Marc Zinnschlag
4c0dcd46a1 added UniversalId class 2012-11-24 11:01:53 +01:00
Marc Zinnschlag
019146756f minor documentation changes regarding future improvements and additions 2012-11-24 10:14:43 +01:00
scrawl
70aa7459f5 GetWeaponDrawn 2012-11-24 03:04:26 +01:00
scrawl
be82d1452f HasItemEquipped 2012-11-24 02:59:44 +01:00
scrawl
600ed5f38a GetAttacked 2012-11-24 02:48:53 +01:00
scrawl
50baf6dac7 moved to controlextensions 2012-11-24 02:45:25 +01:00
scrawl
a596d23203 GetArmorType 2012-11-24 02:38:10 +01:00
scrawl
d7811624d5 GetEffect 2012-11-24 02:15:55 +01:00
scrawl
e8ef4dba1e getPcRunning, getPcSneaking, getForceRun, getForceSneak 2012-11-24 02:02:49 +01:00
scrawl
10329c780d GetLocked 2012-11-23 21:31:10 +01:00
Marc Zinnschlag
a6c7f16a7b Merge remote-tracking branch 'scrawl/reputation' 2012-11-23 21:26:44 +01:00
scrawl
d418e21371 <Mod|Get><Flee|Fight|Hello|Alarm> 2012-11-23 21:14:32 +01:00
scrawl
9c170af30c SameFaction 2012-11-23 20:57:08 +01:00
scrawl
d54ed557bf Equip 2012-11-23 20:48:59 +01:00
scrawl
064cb80c0a fix wait dialog fading 2012-11-23 20:48:53 +01:00
scrawl
0af869c816 GetReputation 2012-11-23 20:22:51 +01:00
scrawl
eb29b1593b ModReputation, SetReputation 2012-11-23 19:56:45 +01:00
scrawl
f218ef2675 fix separator 2012-11-23 19:21:13 +01:00
scrawl
1d7e92b6b3 dialogue fixes 2012-11-23 19:05:40 +01:00
Marc Zinnschlag
303506d24b added new document function 2012-11-23 14:08:20 +01:00
Marc Zinnschlag
997386d873 implemented world verify function (doesn't do anything yet; mostly meant as a test for multi-operation interface) 2012-11-23 13:15:45 +01:00
Marc Zinnschlag
2fc183d595 added operations progress bar 2012-11-23 12:20:35 +01:00
Marc Zinnschlag
eaa58e0530 preparations for multiple parallel progress-type operations 2012-11-23 10:52:46 +01:00
Marc Zinnschlag
04158d03b0 clean up properly after closing a top level window 2012-11-23 10:30:14 +01:00
Marc Zinnschlag
03aacd3263 added progress tracking 2012-11-23 10:25:34 +01:00
Marc Zinnschlag
931eb08114 implemented edit locking (used during saves) 2012-11-23 00:51:04 +01:00
Marc Zinnschlag
5838929371 implemented a dummy save function (does not actually save anything) 2012-11-23 00:36:01 +01:00
Marc Zinnschlag
d7c63d4c74 track document modification state and display it in the top level window title bar 2012-11-22 23:42:17 +01:00
Marc Zinnschlag
d7af9fbec6 various fixes 2012-11-22 17:24:28 +01:00
Marc Zinnschlag
6643674b13 ESM tool fix 2012-11-22 17:23:25 +01:00
Marc Zinnschlag
8e546ebd30 added test command 2012-11-22 16:00:23 +01:00
Marc Zinnschlag
ed3d8b8ca2 added undo stack and undo/redo actions 2012-11-22 15:54:31 +01:00
Marc Zinnschlag
1ddcea1f07 display view indices in title bar 2012-11-22 15:25:16 +01:00
Marc Zinnschlag
789cecb9df added main menu and implemented new view function 2012-11-22 14:51:38 +01:00
Marc Zinnschlag
758371d7e4 implemented view/document closing 2012-11-22 14:10:23 +01:00
Marc Zinnschlag
9834bb3ad5 basic document handling 2012-11-22 13:30:02 +01:00
Marc Zinnschlag
d684b3ae11 fixed getString function in NIF loader 2012-11-22 10:35:03 +01:00
Marc Zinnschlag
9201baebf9 template fix 2012-11-22 10:19:11 +01:00