mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 00:26:39 +00:00
Code Issues Releases Wiki Activity
14327 commits 115 branches 76 tags 128 MiB
Commit graph

14327 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
2e31f01585 Merge remote-tracking branch 'maqifrnswa/bug2407' 2015-03-04 16:55:46 +01:00
scrawl
cced508916 Remove unintended 1.5 factor for damage/restore magic effects 2015-03-04 01:49:00 +01:00
cc9cii
fb2ba7610c Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/idtable.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
 2015-03-04 11:22:42 +11:00
scrawl
8931ddf428 Remove unneeded casts 2015-03-03 23:46:53 +01:00
Scott Howard
d01e8cc97d PositionCell/PlaceItemCell: add console message if cell doesn't exist 2015-03-03 17:36:22 -05:00
Marc Zinnschlag
c66bf41ac2 Merge remote-tracking branch 'scrawl/master' into openmw-35-1 2015-03-03 18:23:38 +01:00
Marc Zinnschlag
1ed606065c save start script records 2015-03-03 16:11:00 +01:00
Marc Zinnschlag
a148b851c0 added start script table 2015-03-03 14:32:12 +01:00
Marc Zinnschlag
4e1c086d6a load start up script records 2015-03-03 14:31:59 +01:00
Marc Zinnschlag
bf92d5cde9 removed redundant mScript field in ESM::StartScript 2015-03-03 13:04:57 +01:00
Marc Zinnschlag
cdf53c17e7 updated version number 2015-03-03 11:54:35 +01:00
Marc Zinnschlag
3b8d709583 Merge remote-tracking branch 'maqifrnswa/bug2407' 2015-03-03 11:26:25 +01:00
scrawl
a8cb4e807b Warning fix 2015-03-03 11:24:23 +01:00
Marc Zinnschlag
455684981c Merge remote-tracking branch 'scrawl/master' 2015-03-03 11:08:15 +01:00
Marc Zinnschlag
4106f8d867 Merge remote-tracking branch 'cc9cii/records-without-name' 2015-03-03 11:06:58 +01:00
Marc Zinnschlag
48db8f894d Merge remote-tracking branch 'scrawl/cmake' 2015-03-03 10:42:16 +01:00
cc9cii
66ef9d237c Another try to make it work with gcc/travis. 2015-03-03 10:12:40 +11:00
scrawl
f09cbfb167 Add a comment 2015-03-02 23:29:33 +01:00
scrawl
666248618e Fix reference cell movement leaving behind deleted Ptrs for script access 2015-03-02 23:20:59 +01:00
scrawl
17e3069896 Minor efficiency fix 2015-03-02 22:33:37 +01:00
cc9cii
7c0f5b72c5 Add enum namespace to workaround travis. 2015-03-03 08:31:06 +11:00
scrawl
f6509fe53e Another crash fix for land record without data 2015-03-02 22:23:00 +01:00
scrawl
8eb1f4e70e Remove more log spam 2015-03-02 22:13:50 +01:00
cc9cii
a8427c2efb Do not add NAME subrecords while saving magic effects or scripts. 2015-03-03 07:36:11 +11:00
scrawl
e3f1cb8305 Remove "loading cell" message 
This spams the log too much, in particular when loading a savegame.
 2015-03-02 21:12:21 +01:00
scrawl
653ddd3f25 Warning fix 2015-03-02 20:16:11 +01:00
Marc Zinnschlag
8b84fa5579 Merge remote-tracking branch 'scrawl/master' 2015-03-02 20:01:31 +01:00
Marc Zinnschlag
928bb234ce Merge remote-tracking branch 'cc9cii/editor-gamefiles' 2015-03-02 19:57:46 +01:00
Marc Zinnschlag
36ea374c10 Merge remote-tracking branch 'sandstranger/fixes-for-glsles2' 2015-03-02 19:34:25 +01:00
Scott Howard
53213bf236 if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407 2015-03-02 11:53:59 -05:00
scrawl
730138035d Cycle infinite loop fix (Fixes #2421) 2015-03-02 17:25:26 +01:00
scrawl
1eaa64c49c CMake: remove lines for MinGW, no one is maintaining those 2015-03-02 15:45:44 +01:00
scrawl
c6aa374934 CMake: set windows warning levels globally instead of per target 2015-03-02 15:45:29 +01:00
scrawl
c57f9ad5dc CMake: don't use CMAKE_CXX_FLAGS for gcc warning levels, it only works for CMAKE_BUILD_TYPE=None 2015-03-02 15:44:27 +01:00
scrawl
191c0104f6 Crash fix for creatures with no skeleton base (Fixes #2419) 2015-03-02 15:19:57 +01:00
scrawl
0ad514b29b Fix collision for nodes with MRK extra data (Fixes #2415) 2015-03-02 01:03:03 +01:00
scrawl
fb0fdf0312 New look for fps counter 2015-03-01 23:58:16 +01:00
scrawl
a653716e2c Fix for damage/restore effects using the instant apply path when they have a duration 2015-03-01 22:22:20 +01:00
cc9cii
1ee6153940 Remove unnecessary boolean passing between objects. 2015-03-02 06:51:31 +11:00
scrawl
239c0071f5 Armor tooltip should show the effective armor rating 2015-03-01 19:40:38 +01:00
Marc Zinnschlag
64938b3796 Merge remote-tracking branch 'cc9cii/saving-skil' 2015-03-01 10:36:26 +01:00
Marc Zinnschlag
185757da43 Merge remote-tracking branch 'dteviot/Bug2367' 2015-03-01 10:24:02 +01:00
Marc Zinnschlag
59c7fe28d9 Merge remote-tracking branch 'naclander/master' 2015-03-01 10:23:08 +01:00
Marc Zinnschlag
babac842f6 Merge remote-tracking branch 'scrawl/joystick' 2015-03-01 10:01:10 +01:00
sylar
4c57cfc2d3 fixes for glsles2 2015-03-01 09:49:33 +04:00
dteviot
cdee6f41fc fix: multi effect spell with different ranges (Fixes #2285) 
Applies all effects for a spell with multiple effects, where not all effects have the same range.
 2015-03-01 15:34:18 +13:00
cc9cii
5ff66ad40b Fix Bug #2402. SKIL records should not have NAME subrecord. 2015-03-01 13:09:23 +11:00
cc9cii
c4625b94e5 Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS. 2015-03-01 12:52:43 +11:00
dteviot
41e15e0c2d Limit maximum attribute damage (Fixes #2367) 
Maximum damage that an attribute can have = base + fortify.
 2015-03-01 10:27:51 +13:00
scrawl
2f2a95f735 Fix crash for terrain without data, part 2 2015-02-28 19:33:49 +01:00