mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
17,331 Commits
38 Branches
54 Tags
121 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a6467c9c47'
${ noResults }
Commit Graph

716 Commits (a6467c9c47a08a18f9bc5a3bc4f9581f3409eb17)

Author SHA1 Message Date
Marc Zinnschlag a445683312 Merge branch 'mergetool' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 9 years ago
Marc Zinnschlag a8dc1c1198 merge land tables 9 years ago
Marc Zinnschlag 69b9eadb52 refactored loading of land data 9 years ago
Marc Zinnschlag b0641934d4 added copy constructor and assignment operator for Land record struct 9 years ago
slothlife 7817c52cbb Discard old save game weather records 9 years ago
slothlife 54fa5273dc Refactor weather transitions to act more like MW 
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
 9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 10 years ago
Stanislav Bas f9b0b7ede5 Make saving of deleted ESM records more consistent 10 years ago
Stanislav Bas 9a8ca81907 Fix missing break in switch statement 10 years ago
Stanislav Bas daaff1284e Remove unused includes 10 years ago
Stanislav Bas 4a16eba716 Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records 10 years ago
Stanislav Bas 1e8182220a Fix build errors & warnings 10 years ago
Stanislav Bas f5745749a6 Remove <cstdint> include file from loaddial.cpp 10 years ago
Stanislav Bas 5fd48efd28 Some refactoring. Remove unused code 10 years ago
Stanislav Bas e65ff723ce More ESM records have DELE handling. 
Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter
 10 years ago
Stanislav Bas ad353e6dd0 Refine DELE handling in ESM records. Add position-independent DELE search 10 years ago
scrawl 41bed4c7d9 Use multimap to speed up custom map marker code 10 years ago
Stanislav Bas e8a9567be3 Move DELE handling to CellRef record 10 years ago
Stanislav Bas b55a4999ca Add NAME handling to DebugProfile and Filter records 10 years ago
Stanislav Bas c8c79dc1ef Move ID loading into a separate method for Dialogue and DialInfo records 10 years ago
Stanislav Bas 74a055f3cc Remove NAME and DELE handling from IdCollection 10 years ago
Stanislav Bas c266315a35 Load/read methods in MWWorld::Store return a pair (record ID, deleted flag) 10 years ago
Stanislav Bas 2ed182b144 Update to upstream/master. Resolve merge conflicts in MWWorld::Store 10 years ago
Stanislav Bas adec0cb61d Add removing of deleted Infos to Dialogue::clearDeletedInfos() 10 years ago
Stanislav Bas e0983c815c Some fixes for ESM Dialogues and Infos 10 years ago
Stanislav Bas 7ecb54a776 Set Deleted flag to false when initializing ESM records 10 years ago
Stanislav Bas 89e44c8f1f Remove explicit record ID in load/read methods of MWWorld::Store 10 years ago
Stanislav Bas b2f3ccb080 Add NAME handling to GameSetting record 10 years ago
Stanislav Bas 09a3358017 Add NAME and DELE handling to Global record 10 years ago
Stanislav Bas 30b42bf4c0 Remove redundant code 10 years ago
Stanislav Bas 8c3654af11 Add NAME handling to Race record 10 years ago
Stanislav Bas b667338a8f Add NAME and DELE handling to Cell record 10 years ago
Stanislav Bas 847614c26f Add DELE handling to Info record 10 years ago
Stanislav Bas 0b537186e5 Add NAME and DELE handling to Dialogue record 10 years ago
Stanislav Bas 19ac4e942a Change DELE sub-record value to 0 (4 bytes) 10 years ago
Stanislav Bas d2c15647a3 Add NAME and DELE handling to Script record 10 years ago
Stanislav Bas 9ac20a3355 Add NAME and DELE handling to ESM records. 
Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case.
 10 years ago
Stanislav Bas 926c825d0c Add NAME and DELE handling to ESM records. 
Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record.
 10 years ago
Alexander "Ace" Olofsson 2bebfea38d Instantiate struct as a struct 10 years ago
Alexander "Ace" Olofsson 3655ef16af Explicitly instantiate ESM::StatState 10 years ago
scrawl a1432b0255 Move attackingOrSpell flag to the CharacterController 10 years ago
scrawl a081d402c5 Use the format field instead of version field 10 years ago
scrawl 4637750601 Savegame loading optimization 10 years ago
scrawl 1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
 10 years ago
scrawl 502cc852da Handle encoding conversions when saving TES3 header (Fixes #2727) 10 years ago
scrawl 882e359008 Move attackStrength to the CharacterController, where it should have been to begin with 
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
 10 years ago
scrawl 5bc6513e2d Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime 10 years ago
scrawl 5ac502d104 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 10 years ago
scrawl d3ef075952 Fix an uninitialized variable 10 years ago
scrawl a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
 10 years ago
scrawl 2ce269c0fc Werewolf stats compatibility with old save files 10 years ago
scrawl d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 10 years ago
scrawl 44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves 
Still need to deal with save files.
 10 years ago
scrawl cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 10 years ago
Marc Zinnschlag e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 10 years ago
scrawl 28caeadef4 Improve error message for not found records 10 years ago
cc9cii b81454d226 Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668. 10 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 10 years ago
scrawl b70383d127 Remove last remains of Ogre math 10 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 10 years ago
scrawl cdd0623009 Terrain rendering 10 years ago
scrawl de8e5f0db1 Restore projectiles 10 years ago
scrawl a066b24303 Restore WeaponAnimation 10 years ago
cc9cii 5fd107a95c Fix crash with array out of bounds when refNum index is incorrect. 10 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 10 years ago
cc9cii 7f12fc4770 Fix for Bug #2544. Add a default mNpdtType to ESM::Npc::blank(). 10 years ago
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 10 years ago
Marc Zinnschlag ba57a648db Merge remote-tracking branch 'rohit-n/reorder' 10 years ago
Marc Zinnschlag 607a16eb01 removed leftover ignoreRefNum argument 10 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 10 years ago
cc9cii 7673be6d0f Loading of moved refs complete. 10 years ago
cc9cii e668b35b02 Fix typo. 10 years ago
cc9cii dcce59f76c Pass MovedCellRef info to RefCollection. Still has debugging code. 10 years ago
cc9cii acb800b8f9 Resolve merge issues and fix typos. 10 years ago
cc9cii f1a58994c6 Merge branch 'master' into moveref 
Conflicts:
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/ref.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
	components/esm/cellref.hpp
 10 years ago
scrawl 68f93294da Port EffectManager 10 years ago
scrawl 25f1c1ae76 Remove persistent flag which will be unused 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 10 years ago
scrawl 232e34bddd OpenCS: port lighting toolbar, fix multiple context GL objects issue 10 years ago
scrawl 236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 10 years ago
Nikolay Kasyanov 3e45e9a48a Remove no longer required strnlen wrapper 
It was used for MinGW & OS X < 10.7. Minimal OS X version was bumped to
10.7 and MinGW support was recently dropped (see
1eaa64c49c).
 10 years ago
cc9cii 488bc76da5 Fix saving land data. 10 years ago
Marc Zinnschlag 056bc66c6c Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 5f051b5bf2 Remove comment about GMST cleaning which was removed. 10 years ago
Scott Howard e2ef8c4022 fix -Wnewline-eof warnings 10 years ago
scrawl e30f240ba2 Add travel service support for creatures (Fixes #2432) 10 years ago
dteviot 36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
 10 years ago
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
 10 years ago
Marc Zinnschlag ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 10 years ago
dteviot f2ac939e61 reverted mShouldRepeat back to unsigned char. 
As recommended by Scrawl.
 10 years ago
dteviot 45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 10 years ago
cc9cii d28f257ada Fix for bug #2428. Set default flag value (mandatory) for containers. 10 years ago
Marc Zinnschlag 4e1c086d6a load start up script records 10 years ago
Marc Zinnschlag bf92d5cde9 removed redundant mScript field in ESM::StartScript 10 years ago
scrawl da690c91b3 Delete the old Ogre DataStream class 10 years ago
scrawl 8f0ab7d09f ESM component no longer relies on Ogre DataStreams 10 years ago
Marc Zinnschlag 8686ffcedb Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 96a295c44f Fix for deleting all items in a levelled list 10 years ago
scrawl 8b417c06db Fix missing clear in ESM::Spell::load (Fixes #2368) 10 years ago
Kamil Bar 3b7a23aa72 Fixed charge checks for light and other objects, corrected CellRef charge union comments 10 years ago