mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 16:49:55 +00:00
Code Issues Releases Wiki Activity
13374 commits 38 branches 54 tags 122 MiB
Commit graph

13374 commits

This branch
This branch
All branches
Author SHA1 Message Date
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
cc9cii
a54ab153b0 Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429. 2015-03-08 10:05:10 +11:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
scrawl
58807064b4 Revert "Fix reference cell movement leaving behind deleted Ptrs for script access" 
This reverts commit 666248618e.
 2015-03-07 15:31:21 +01:00
cc9cii
ca21181483 Fix typo to get table display working. 2015-03-07 11:42:50 +11:00
dteviot
f2ac939e61 reverted mShouldRepeat back to unsigned char. 
As recommended by Scrawl.
 2015-03-07 11:04:54 +13:00
Marc Zinnschlag
900745f577 updated changelog 2015-03-06 20:05:05 +01:00
dteviot
27f91a8326 correction from Scrawl. 
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
 2015-03-06 19:47:46 +01:00
Marc Zinnschlag
907ac5ef7f Merge remote-tracking branch 'scrawl/master' 2015-03-06 19:24:15 +01:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
dteviot
407cd50890 fixed warning C4099: 
type name first seen using 'class' now seen using 'struct'
 2015-03-06 21:36:42 +13:00
cc9cii
727b68dd15 Reduce difference with the master branch where possible. 2015-03-06 19:20:50 +11:00
cc9cii
6d6ff8c6a4 Resolved compile issues, but not fully working. 2015-03-06 14:36:13 +11:00
scrawl
5a47b7ae6e Warning fix 2015-03-06 02:36:12 +01:00
scrawl
0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 2015-03-06 02:36:12 +01:00
cc9cii
d28f257ada Fix for bug #2428. Set default flag value (mandatory) for containers. 2015-03-06 11:53:46 +11:00
scrawl
c7cd576002 Remove leftover of old tests 2015-03-05 23:12:47 +01:00
Marc Zinnschlag
3c190e5fa4 Merge remote-tracking branch 'dteviot/Bug2285' 2015-03-05 20:32:34 +01:00
Marc Zinnschlag
0b70fdac57 added start script verifier 2015-03-05 11:24:01 +01:00
dteviot
80fe24207c correction from Scrawl. 
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
 2015-03-05 20:21:22 +13:00
Marc Zinnschlag
9f155df761 Merge remote-tracking branch 'maqifrnswa/bug2407' into openmw-35-1 2015-03-04 17:09:13 +01:00
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