mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 15:53:54 +00:00
Code Issues Releases Wiki Activity
10118 commits 108 branches 66 tags 133 MiB
Commit graph

1645 commits

Author SHA1 Message Date
Thomas
f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 2014-04-23 13:02:51 -04:00
Thomas
61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 2014-04-23 10:00:18 -04:00
Thomas
420163d35f Small changes to lock command (If no valid lockLevel exists, defaults to 100) 2014-04-23 05:19:34 -04:00
scrawl
6929e541dd Fix texture name issue with Vality's Bitter Coast Mod 2014-04-21 05:30:14 +02:00
scrawl
2cb9f38a45 Changed crime IDs for legacy savegames. Not an issue, but it was inconsistent. 2014-04-20 19:34:58 +02:00
scrawl
262e959699 Remove unused slice_array 2014-04-20 19:28:39 +02:00
scrawl
d3d0b7362f Fix older savegame compatibility regarding new crime feature. 2014-04-18 12:34:26 +02:00
Marc Zinnschlag
86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2014-04-15 11:31:48 +02:00
Marc Zinnschlag
300eb6f444 make FNAM sub-record optional for all record types 2014-04-13 13:23:50 +02:00
Jeffrey Haines
a274b48f2f States are saved. Crime is reacted to. 
Issues where some crime is ignored. Needs a lot more work
 2014-04-05 22:45:40 -04:00
megaton
50af9bc0d3 General perfomance optimizations. 2014-03-30 19:45:27 +04:00
Marc Zinnschlag
2c2106205d Merge remote-tracking branch 'scrawl/master' 2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21 Bug #1224: Changed fix to potentially allow for language independent saves 2014-03-27 22:32:42 +01:00
scrawl
53ba23e303 Fixes #1224: Store class name instead of id in savegame header 2014-03-26 19:56:12 +01:00
Marc Zinnschlag
1b6b4e3442 Merge remote-tracking branch 'slothlife/weather_save' 2014-03-23 08:36:45 +01:00
scrawl
452b522bc3 Fix typos 2014-03-22 19:01:41 +01:00
slothlife
00eac7d53a Fixed header include guard to match filename 2014-03-21 01:22:54 -05:00
slothlife
6eab9c5179 Move weather state save/load to a new class 2014-03-21 01:19:40 -05:00
slothlife
1acd1bd913 Feature #1173: Saved Game: include weather state 
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
 2014-03-20 01:25:52 -05:00
Marek Kochanowicz
6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
 2014-03-19 10:23:15 +01:00
scrawl
c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 2014-03-16 23:49:06 +01:00
scrawl
b0a1e1198a Yet another terrain fix 2014-03-16 16:30:17 +01:00
scrawl
a9dcc90970 Another terrain fix 2014-03-09 11:59:23 +01:00
Marc Zinnschlag
2de862126a moved resources group creation from Engine to bsa component 2014-03-09 11:42:39 +01:00
scrawl
b8ca067730 Small fix for terrain 2014-03-09 03:21:34 +01:00
Marc Zinnschlag
f1353dc84f Merge branch 'scene' 2014-03-06 16:46:44 +01:00
scrawl
d0f98103e4 Terrain: re-added "distant land=off" path 
Still a hack, but the overhead of building and traversing the quad tree appears negligible.
 2014-03-06 03:04:23 +01:00
scrawl
1d926816b5 Terrain: background load blendmaps & layer textures. Refactor QuadTree update. 2014-03-05 21:46:37 +01:00
scrawl
4328e08162 Terrain: get rid of unneeded members 2014-03-05 21:46:37 +01:00
scrawl
6a002d19b3 Terrain: destroy no longer used materials 2014-03-05 21:46:37 +01:00
scrawl
97c3efb3ba Terrain: decoupled Chunk from QuadTreeNode. 2014-03-05 21:46:37 +01:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
scrawl
195071efc7 Terrain: geometry is now loaded in background threads. 
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
 2014-03-05 21:46:37 +01:00
scrawl
b3fed853ae Terrain: take cell world size into account for LOD selection 2014-03-05 21:46:37 +01:00
scrawl
6c863486e1 Terrain: fix an embarrassing copy&paste mistake. 2014-03-05 21:46:36 +01:00
scrawl
64c9932597 Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function) 2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f Terrain: support alternate coordinate systems. Get rid of LoadingListener for now 2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
Marc Zinnschlag
f9d2fde783 Merge branch 'openmw-29' 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
 2014-03-04 09:34:38 +01:00
Marc Zinnschlag
6e8b9c88b2 changed name of default worldspace (should reduce chance of a name conflict) 2014-03-02 22:43:15 +01:00
cc9cii
46867ec0cf Fix file handles being left open on windows builds 2014-03-01 07:24:20 +11:00
cc9cii
2421f23c2f cleanup the mess... 2014-02-27 23:59:23 +11:00
Marc Zinnschlag
bfcd768078 various bits of cleanup 2014-02-23 21:39:18 +01:00
cc9cii
1ab5948f19 merge upstream changes 2014-02-23 19:11:37 +11:00
Marc Zinnschlag
d780364842 fixed record size type 2014-02-22 17:31:44 +01: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
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
Marc Zinnschlag
c5b2c154f8 another esm writer fix 2014-02-20 12:49:56 +01:00
Marc Zinnschlag
72b29ddb79 fix broken esm writer header code 2014-02-20 12:35:57 +01:00
scrawl
1fba5d1bb9 Terrain: change world bounds from AABB to 4 floats 2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc Moved includes to appropriate place 2014-02-19 11:23:03 +01:00
Marc Zinnschlag
44f6f79bf5 Merge remote-tracking branch 'corristo/osx-ogre-19' 2014-02-16 17:12:52 +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
Nikolay Kasyanov
8f99da084b OS X: plugins are now in Frameworks dir, not in Plugins 2014-02-16 14:13:12 +04:00
Marc Zinnschlag
0d84adb2c6 allow x->(y) instead of (x->y) 2014-02-15 12:50:40 +01:00
Marc Zinnschlag
fd665a1994 ignore conditions after an else (only works if condition is put in parentheses) 2014-02-15 12:45:50 +01:00
Marc Zinnschlag
d213c6c36a fixed a constness-issue 2014-02-14 12:23:00 +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
Marc Zinnschlag
e76ef92669 also allow the use of keywords as remote local variables in set statements 2014-02-14 09:06:06 +01:00
Marc Zinnschlag
2086ebe410 fix for inappropriate disable (2nd attempt) 2014-02-14 08:48:26 +01:00
Marc Zinnschlag
b01c6dad37 Revert "allow disable as an alias for getDisabled (in most cases)" 
This reverts commit f7ff4fbd51.
 2014-02-14 08:29:18 +01:00
Nikolay Kasyanov
c2fe0d480a Merge remote-tracking branch 'upstream/master' into osx-ogre-19 
Conflicts:
	CMakeLists.txt
 2014-02-14 00:04:16 +04:00
Marc Zinnschlag
053b3dc371 Merge branch 'openmw-28' 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:57:28 +01:00
Nikolay Kasyanov
58add97676 Merge branch 'master' into osx-ogre-19 
Conflicts:
	CMakeLists.txt
 2014-02-13 20:34:06 +04:00
Marc Zinnschlag
f7ff4fbd51 allow disable as an alias for getDisabled (in most cases) 2014-02-13 15:31:07 +01:00
Marc Zinnschlag
d6e212a02b Merge branch 'master' into script 2014-02-13 15:02:02 +01:00
Marc Zinnschlag
309573a3ac allow the use of the keyword end as a variable name in an expression 2014-02-13 14:15:48 +01:00
Marc Zinnschlag
d73097c2e4 Merge remote-tracking branch 'scrawl/master' 2014-02-13 13:13:37 +01:00
scrawl
d4a755d1aa Fix some hardcoded literals 2014-02-13 11:15:55 +01:00
Marc Zinnschlag
9c52820754 Merge remote-tracking branch 'scrawl/master' 2014-02-13 10:54:51 +01:00
scrawl
c6fb0f2d9b Removed terrain component's dependency on ESM 2014-02-13 10:13:53 +01:00
Marc Zinnschlag
ac8290c4d3 fixed problem with line endings in case of a local variable redeclaration 2014-02-13 09:59:22 +01:00
Marc Zinnschlag
dde4fbd818 allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away 2014-02-13 09:52:44 +01:00
Marc Zinnschlag
87b51e47a9 fixed another case issue in remote member access 2014-02-13 09:40:07 +01:00
Marc Zinnschlag
c03bd8ebb6 allow [] as aliases for () 2014-02-13 08:59:33 +01:00
Marc Zinnschlag
0313876d88 allow leaving out if in a top-level if-statement 2014-02-13 08:49:40 +01:00
Marc Zinnschlag
2eeb0eb4f3 allow lines to continue with other instructions after an legit else 2014-02-13 08:38:26 +01:00
Marc Zinnschlag
749136bf33 ignore attempts to set non-existing variables 2014-02-12 20:23:47 +01:00
Marc Zinnschlag
a85d3c7dcb ignore unused explicit references for functions 2014-02-12 13:53:59 +01:00
Marc Zinnschlag
6e2e4d1adf ignore stray begin 2014-02-12 13:45:01 +01:00
Marc Zinnschlag
93d4743012 interpret instruction keywords as names within expressions 2014-02-12 09:56:25 +01:00
Marc Zinnschlag
c0a6acfe6c allow the use of keywords as variable names in more places 2014-02-12 09:23:23 +01:00
Marc Zinnschlag
b1b0877122 allow additional numeric argument for AiFollow and ignore it 2014-02-12 09:14:32 +01:00
Marc Zinnschlag
bfb0e62c4a ignore additional string argument after enable/disable 2014-02-12 09:10:05 +01:00
Marc Zinnschlag
61626e90da allow additional string argument for stopcombat and addspell (ignored) 2014-02-12 08:53:37 +01:00
Marc Zinnschlag
6a5d88b640 ignore stray else and endif in scripts 2014-02-12 08:42:42 +01:00
Marc Zinnschlag
697bda6371 allow (and discard) explicit reference on instructions that do not accept explicit references 2014-02-11 14:55:31 +01:00
Marc Zinnschlag
f26aa4f645 fixed while loop implementation 2014-02-11 13:31:04 +01:00
Emanuel Guevel
8c8f4cd420 Fix typo 2014-02-10 22:53:16 +01:00
Marc Zinnschlag
5c0071f320 fixed spelling of an error message 2014-02-10 14:59:20 +01:00
Marc Zinnschlag
3b990795c4 added access to remote access of local variables of global scripts 2014-02-10 14:45:55 +01:00
Marc Zinnschlag
3147aebf75 factored out declaration parser 2014-02-10 13:01:52 +01:00
scrawl
0cc1cd8f7e Fix message box formatting bug 2014-02-05 05:18:11 +01:00
scrawl
2c0d46525b Fast-forward particle systems to make cell loads less obvious. 2014-02-05 05:18:09 +01:00
scrawl
cf3812188f Fix bounding box assertions due to negative particle life time 
Other parts of the code could not deal with negative life times and produced negative particle sizes as a result (which Ogre could not handle)
 2014-02-05 05:18:09 +01:00