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

2310 commits

Author SHA1 Message Date
slothlife
d9a7986b3a Remove redundant fast forward check 2015-08-28 18:04:22 -05:00
slothlife
4fd00a75d5 Merge advanceTime and advanceTimeByFrame 2015-08-27 14:53:52 -05:00
slothlife
cd8ec5c11e Improve checking for older weather records 2015-08-27 13:44:06 -05:00
slothlife
7817c52cbb Discard old save game weather records 2015-08-27 09:57:32 -05:00
slothlife
c907ed517d Remove C++11 explicit on conversion operator 2015-08-26 23:34:15 -05:00
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
 2015-08-26 22:59:21 -05:00
scrawl
b509a18065 Remove code setting PcRace (Fixes #2886) 
This is already handled by the RaceCheck script.
 2015-08-23 14:30:23 +02:00
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
scrawl
542c648e69 Fix incorrect assignment of PcRace, need to sort race IDs (Fixes #2884) 2015-08-22 22:53:06 +02:00
Marc Zinnschlag
50ec8b10f5 Merge remote-tracking branch 'dteviot/Bug2871' 2015-08-22 10:37:43 +02:00
scrawl
ba8e4c22aa Avoid using loops to wrap angle values (Fixes #2882) 2015-08-21 20:17:42 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb replaced FLT_MAX with numeric_limits. 2015-08-21 19:34:28 +12:00
dteviot
ff5ef7055e extracted function CreatureStats::isParalyzed() 2015-08-20 18:12:37 +12:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
Marc Zinnschlag
e888fd7034 Merge remote-tracking branch 'scrawl/delete_noop' 2015-08-17 18:21:56 +02:00
Marc Zinnschlag
3992125b61 Merge remote-tracking branch 'scrawl/master' 2015-08-17 14:05:51 +02:00
Marc Zinnschlag
b5f3f0522a Merge remote-tracking branch 'slothlife/weather-settings-fix' 2015-08-17 14:03:54 +02:00
scrawl
b583a2ec33 Make SetDelete a no-op for items in containers (Fixes #2864) 2015-08-17 00:06:26 +02:00
Jordan Ayers
be7bd9529d Classes shouldn't use MWBase::Environment to access their own members. 2015-08-16 16:56:44 -05:00
slothlife
3d419a612a Corrected some weather transition calculations 
Reversed some formulas for Transition Delta and Clouds Maximum Percent
and implemented them. Refactored Weather some to encapsulate those
formulas (to more closely match MoonModel). Did some small cleanup of
WeatherManager.
 2015-08-15 23:38:49 -05:00
scrawl
8426d376f0 Use separate touch spell raycasts for actors and objects (Fixes #2849) 2015-08-16 02:06:04 +02:00
scrawl
1e18a73b1c Don't play magic effect sounds & visual effects for unsuitable targets (Fixes #2811) 2015-08-13 17:08:21 +02:00
scrawl
211deeb63e Don't attempt to lock or unlock unsuitable objects (Fixes #2826) 2015-08-13 17:08:21 +02:00
scrawl
86f0e505e9 Add a fixPosition for the --start exterior cell (Fixes #2790) 2015-08-13 17:08:20 +02:00
scrawl
56b7196bea Remove incorrect implementation of "Clouds Maximum Percent" weather setting 2015-08-07 15:34:01 +02:00
slothlife
3235cecddf Use Glare View for visibility of celestial bodies 
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
 2015-08-07 00:08:18 -05:00
slothlife
ea2f88a355 Fix several sky rendering bugs, maybe also #639 
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
 2015-08-04 21:07:42 -05:00
slothlife
67a63cc662 Add some const correctness to MoonModel 2015-07-30 14:00:08 -05:00
Stanislav Bas
d13766cb3c Remove redundant template specializations 2015-07-30 16:08:22 +03:00
Stanislav Bas
f15adb4e4f Store::load() overwrites loaded records with the same IDs 2015-07-30 15:38:07 +03:00
slothlife
a4e1630ec2 Remove unreferenced member in MoonModel 2015-07-30 00:41:30 -05:00
slothlife
8dc7e158c6 Fix forward declaration of MoonState 2015-07-30 00:18:56 -05:00
slothlife
24ba54f4fe Implement accurate moon settings (fixes #672) 2015-07-29 23:57:45 -05:00
scrawl
7ba399fc92 Change a message to upper case spelling 
More consistent with other loading messages
 2015-07-28 03:21:44 +02:00
Marc Zinnschlag
bafa86d3e9 Merge remote-tracking branch 'scrawl/master' 2015-07-27 11:10:16 +02:00
scrawl
278076e609 Include cleanup 2015-07-25 04:14:22 +02:00
scrawl
3f3c3d0ad3 Remove an already resolved todo comment 2015-07-24 23:28:43 +02:00
scrawl
4f6e5345cc Include cleanup 2015-07-24 23:28:36 +02:00
Pawel Kubik
47922f6c35 Changed a settings variable responsible for number of loaded exterior cells. 2015-07-24 22:01:49 +02:00
scrawl
7f66339790 Remove a redundant function 2015-07-24 20:23:27 +02:00
scrawl
71bc22401f Include cleanup 2015-07-24 18:23:23 +02:00
scrawl
7e4e59efb9 Fix excessive auto-equipping in InventoryStore::removeItem (Fixes #2792) 2015-07-23 02:29:09 +02:00
scrawl
7900631d51 Print the missing player cell to error output 2015-07-23 02:29:09 +02:00
Stanislav Bas
daaff1284e Remove unused includes 2015-07-22 22:18:26 +03:00
Stanislav Bas
67c8f95c4e Load/read methods (for ESM records) accept a deleted flag in OpenMW 2015-07-22 22:15:37 +03:00
Koncord
6c3c85f0d4 Fix indent 
Remove misc.hpp in containerstore.cpp
 2015-07-20 21:53:20 +09:00
Koncord
a24df8cb66 Revert addImp() and remove() 
add isGold() in MWWorld::Class
 2015-07-20 12:43:58 +09:00
Koncord
9485aa5e44 Fix "removeitem gold_100" behavior 2015-07-20 09:53:08 +09:00
Koncord
aefcd1ad07 Fix "additem gold_100" behavior 2015-07-20 08:20:28 +09:00
Koncord
75e5023590 fix code duplication 2015-07-20 08:06:43 +09:00
Stanislav Bas
5fd48efd28 Some refactoring. Remove unused code 2015-07-19 14:58:14 +03:00
Stanislav Bas
e8a9567be3 Move DELE handling to CellRef record 2015-07-15 19:39:01 +03:00
Stanislav Bas
c8c79dc1ef Move ID loading into a separate method for Dialogue and DialInfo records 2015-07-13 11:26:23 +03:00
Stanislav Bas
c266315a35 Load/read methods in MWWorld::Store return a pair (record ID, deleted flag) 2015-07-12 15:20:22 +03:00
Stanislav Bas
2ed182b144 Update to upstream/master. Resolve merge conflicts in MWWorld::Store 2015-07-12 12:01:18 +03:00
Stanislav Bas
e0983c815c Some fixes for ESM Dialogues and Infos 2015-07-11 22:17:53 +03:00
Alexander "Ace" Olofsson
12f413ba9b Don't instantiate specialized templates 
This fixes the VS2012 build issue
 2015-07-10 20:21:55 +02:00
Marc Zinnschlag
ba9a9d16bb Merge remote-tracking branch 'scrawl/master' 2015-07-10 09:06:04 +02:00
scrawl
f12619b86a Implement fStromWindSpeed (Fixes #2764) 2015-07-10 02:34:00 +02:00
Stanislav Bas
20723581a1 Letter case fix for MWWorld::Globals 2015-07-10 00:29:43 +03:00
Stanislav Bas
00bf87b561 Convert IDs of loaded records to lower case in MWWorld::Store 2015-07-10 00:29:41 +03:00
Stanislav Bas
897a52cdda Remove NAME handling from MWWorld::Globals 2015-07-10 00:29:40 +03:00
Stanislav Bas
9301bc148e Remove NAME handling from MWWorld::ESMStore 2015-07-10 00:29:38 +03:00
Stanislav Bas
89e44c8f1f Remove explicit record ID in load/read methods of MWWorld::Store 2015-07-10 00:29:36 +03:00
Alexander "Ace" Olofsson
b3b55a5842 Explicitly instantiate MWWorld::Store 2015-07-09 19:22:04 +02:00
Alexander "Ace" Olofsson
b1cc74dd9a Explicity instantiate MWMechanics::Stat 2015-07-09 14:41:37 +02:00
Alexander "Ace" Olofsson
3655ef16af Explicitly instantiate ESM::StatState 2015-07-07 19:19:37 +02:00
scrawl
a1432b0255 Move attackingOrSpell flag to the CharacterController 2015-07-02 19:14:28 +02:00
scrawl
519fb9482a Minor cleanup 2015-07-02 18:45:11 +02:00
scrawl
ca21e9ecb1 Fix magic hit VFX showing when casting on a static object 2015-06-30 03:14:49 +02:00
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.
 2015-06-26 05:15:07 +02:00
scrawl
5bc6513e2d Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime 2015-06-26 02:32:41 +02:00
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
 2015-06-22 20:09:02 +02:00
scrawl
2ce269c0fc Werewolf stats compatibility with old save files 2015-06-21 18:45:49 +02:00
scrawl
d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves 
Still need to deal with save files.
 2015-06-21 17:28:18 +02:00
scrawl
38d90f47a6 Moon fading fix (Bug #2713) 2015-06-19 18:15:23 +02:00
scrawl
b648722d3b Don't use the ParticleSystem for computing placeable bounds (Bug #2700) 2015-06-17 15:13:41 +02:00
scrawl
1c151f2f0a Re-enable some outcommented sky code 2015-06-16 20:56:48 +02:00
scrawl
3da8f6e62e Water ripples 2015-06-16 20:36:48 +02:00
scrawl
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
scrawl
2476cd4f9a Error message fix 2015-06-14 16:12:18 +02:00
scrawl
28caeadef4 Improve error message for not found records 2015-06-14 02:31:00 +02:00
scrawl
76bdf7a5b7 Add night-eye effect 2015-06-11 23:16:05 +02:00
scrawl
f81c3bcd6d Fix for broken InitWorldSpaceParticles on projectile effects 2015-06-11 16:40:26 +02:00
scrawl
16e080e252 Fix the physics debug drawer lagging a frame behind 2015-06-07 17:00:00 +02:00
scrawl
b33fe8fb62 Fix the inventory listener bug 2015-06-07 16:50:34 +02:00
scrawl
4c09ecef72 Normalize fixes 2015-06-05 03:41:10 +02:00
scrawl
ddfed35d1c Object placement raycasts should use the rendering meshes 2015-06-05 02:26:16 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
cc6d5a3ba0 Fix player setup bug 2015-06-03 19:44:21 +02:00
scrawl
7bacb9418d Various math code ported to osg 2015-06-03 19:41:19 +02:00
scrawl
2a85a22dba Write savegame screenshot 2015-06-03 16:40:16 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
292fa0b5e3 Unify raycasting techniques for "on touch" magic 
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
 2015-06-03 03:16:26 +02:00
scrawl
cee1db532f Improve area orb positioning for "on touch" spells 2015-06-03 03:04:39 +02:00
scrawl
2883ecc19a Fix the hilarious bug of NPCs falling to their deaths in interiors 2015-06-03 02:48:45 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00