1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-07 00:15:32 +00:00
Commit graph

11265 commits

Author SHA1 Message Date
scrawl
acbea2461b Fix a typo 2015-09-04 23:27:33 +02:00
scrawl
d11952c48a Stop rendering when the window is minimized 2015-09-04 03:44:14 +02:00
Marc Zinnschlag
a8dc1c1198 merge land tables 2015-09-03 16:15:00 +02:00
Marc Zinnschlag
85f6bb892b removed indirection in OpenMW-CS land record 2015-08-31 18:13:27 +02:00
Marc Zinnschlag
69b9eadb52 refactored loading of land data 2015-08-31 16:13:26 +02:00
Marc Zinnschlag
b3fdf92d2b more const-ness fixes 2015-08-31 16:08:19 +02:00
Marc Zinnschlag
febf611c82 made return type of ESMTerrain::Storage::getLand const 2015-08-31 14:17:11 +02:00
Marc Zinnschlag
69045d7ec9 additional safety check for land texture listing merge stage 2015-08-31 11:10:58 +02:00
Marc Zinnschlag
7a96a04b75 Merge remote-tracking branch 'origin/master' 2015-08-31 09:22:19 +02:00
Marc Zinnschlag
a8bee25757 Merge remote-tracking branch 'dteviot/FixStuckDraft' 2015-08-31 09:18:36 +02:00
Marc Zinnschlag
4b7a034cf9 Merge remote-tracking branch 'slothlife/weather-transition-fix' 2015-08-31 09:03:04 +02:00
scrawl
8aaba0af6f Fix journal page navigation bug introduced by 7dd09dd637 (Fixes #2899) 2015-08-30 17:38:21 +02:00
Marc Zinnschlag
890bbb6b11 merge land texture tables 2015-08-30 14:27:22 +02:00
Marc Zinnschlag
b7983d08ba fixed merge stage order; added proper initialisation 2015-08-30 11:08:56 +02:00
dteviot
1dfe438a5d reduce "reset if stuck" AiWander timeout.
Now is about 14 seconds, instead of 300.
2015-08-30 16:43:35 +12:00
dteviot
39c2ba8efe Pathfinding bugfix.
Observed at Ebonheart (coe 1, -13).  Especially at the western tower. Guards try to walk though tower door.
Cause: buildPath() adds destination (even when unreachable) when only using single node from pathgrid.
2015-08-30 16:12:51 +12:00
dteviot
f2c9b9351f Try going right and left to "unstick" actor. 2015-08-30 10:06:09 +12:00
dteviot
31d82b6b0c Unifiy evadeObstacles() logic between AiWander and AiPackage
Can't use same code, but logic is now same.
2015-08-30 08:32:47 +12:00
dteviot
f59e918a3b removed useless code.
zTurn ignores turns < 0.0087 radians.
2015-08-29 17:34:33 +12:00
dteviot
0677799839 movement logic in AiPackage uses ObstacleCheck. 2015-08-29 17:21:18 +12:00
slothlife
2b48a20b76 Fix weather transition bugs 2015-08-28 23:12:39 -05:00
slothlife
d9a7986b3a Remove redundant fast forward check 2015-08-28 18:04:22 -05:00
Marc Zinnschlag
45e7522aa6 Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft' 2015-08-28 16:09:18 +02:00
dteviot
300c48329d Creature::isFlagBitSet() changed to free function. 2015-08-28 18:38:05 +12: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
dteviot
95d2d82abf extracted isFlagBitSet() 2015-08-27 18:36:46 +12: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
Marc Zinnschlag
a97a632aa7 merge references tables 2015-08-26 17:21:24 +02:00
Marc Zinnschlag
a9f9a8d58e Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft' 2015-08-26 15:59:28 +02:00
Marc Zinnschlag
845cafd61c fixed record state issues after merge 2015-08-25 12:40:40 +02:00
Marc Zinnschlag
f95950e8d8 merge referenceables table 2015-08-25 11:54:16 +02:00
Marc Zinnschlag
9cf793c0b5 silenced a warning 2015-08-25 11:39:43 +02:00
Marc Zinnschlag
40753aa9a3 simplifying merge stage 2015-08-25 08:43:03 +02:00
dteviot
541d7fb4fb Fixed assorted issues
* destructor is virtual
* renamed class to Actor
* corrected indentation of case statement
2015-08-25 18:19:16 +12:00
Marc Zinnschlag
8f7f29943a Merge remote-tracking branch 'jordan-ayers/topic/dead-code' 2015-08-24 15:13:53 +02:00
Jordan Ayers
cd5bef958f Remove dead code from alchemywindow.
Also align some braces.
2015-08-24 07:43:30 -05:00
dteviot
bb54bbd273 Pulled duplicated functions into common base class 2015-08-24 19:54:02 +12: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
16dda281ce made merge operation more fluent 2015-08-23 13:04:42 +02:00
Marc Zinnschlag
103073150e added info tables and pathgrid table to merge operation 2015-08-23 12:58:49 +02:00
Marc Zinnschlag
c92898a5bc flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first) 2015-08-23 12:37:45 +02:00
Marc Zinnschlag
e76401d5ea Merge remote-tracking branch 'smbas/fix-opencs-bugs' 2015-08-23 12:15:19 +02:00
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
Marc Zinnschlag
562f5cdec1 Merge remote-tracking branch 'scrawl/editor_saving' 2015-08-23 12:07:29 +02:00
scrawl
542c648e69 Fix incorrect assignment of PcRace, need to sort race IDs (Fixes #2884) 2015-08-22 22:53:06 +02:00
Stanislav Bas
ba4b7df99d Add missing includes to columnimp.hpp 2015-08-22 16:35:00 +03:00
Stanislav Bas
720aca8f3d Inform about State change (not a whole row) when modifying a table value 2015-08-22 16:34:57 +03:00
Stanislav Bas
4d24eff859 Show race only when mesh type is Skin (in BodyParts table) 2015-08-22 16:34:54 +03:00
Stanislav Bas
6d81ca07b5 Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData() 2015-08-22 16:34:45 +03:00
scrawl
32ad8c86bf Fix the ESM::LandTexture NAME being discarded on loading 2015-08-22 13:10:54 +02:00
scrawl
031d64d0d3 Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records 2015-08-22 12:57:39 +02:00
Marc Zinnschlag
50ec8b10f5 Merge remote-tracking branch 'dteviot/Bug2871' 2015-08-22 10:37:43 +02:00
Stanislav Bas
b7295e2632 Columns with Display_Boolean use Combobox editor even for non-boolean values 2015-08-21 22:36:53 +03:00
Stanislav Bas
aeb1acca51 Remove enum names for AiWanderRepeat column 2015-08-21 22:05:40 +03:00
Stanislav Bas
e14aedc7cd ModifyCommand uses a proper name of a modified nested value 2015-08-21 21:47:29 +03:00
Stanislav Bas
d038ac2da0 Sort tables by ID in the ascending order initially 2015-08-21 21:38:28 +03:00
scrawl
ba8e4c22aa Avoid using loops to wrap angle values (Fixes #2882) 2015-08-21 20:17:42 +02:00
scrawl
52d8bc555c Add missing checks to see if spell still exists when loading a savegame (Bug #2883) 2015-08-21 14:24:49 +02:00
Marc Zinnschlag
3902513e65 merge id collections 2015-08-21 14:02:32 +02:00
dteviot
5dd0ad6841 Fixed rest of travis errors. 2015-08-21 22:41:31 +12:00
dteviot
3fa5c6a0e7 fixed travis build failure 2015-08-21 22:00:08 +12: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
scrawl
af3b0cd883 Improve some error messages 2015-08-21 00:31:43 +02:00
dteviot
3b231b85bb removed incorrect optimization.
Now it fixes #2871
2015-08-21 06:55:54 +12:00
Marc Zinnschlag
08325d14ca Merge remote-tracking branch 'dteviot/Bug2871' 2015-08-20 20:42:35 +02:00
Marc Zinnschlag
d436dc332b Merge remote-tracking branch 'jeffreyhaines/gametimetracker' 2015-08-20 20:39:44 +02:00
Marc Zinnschlag
5cb0353b5c Merge remote-tracking branch 'jeffreyhaines/npcsdontscream' 2015-08-20 20:28:36 +02:00
dteviot
c0d3804b4f Correctly handle disjoint pathgrid (Fixes #2871)
Bugfix:
When
1. Cell has multiple subgrids  (i.e. path grid is disjoint)
2. Distance between destination and pathgrid point 0 is less than distance to points of subgrid closest to start point
Then getClosestReachablePoint() returns pathgrid point 0 as the end point.
This is invalid, this end point cannot be reached from the start point.
2015-08-20 21:50:58 +12:00
dteviot
0ee7407101 extracted common sub-expressions. 2015-08-20 18:17:02 +12:00
dteviot
ff5ef7055e extracted function CreatureStats::isParalyzed() 2015-08-20 18:12:37 +12:00
Jeffrey Haines
f94d3237fc Removed unused cmake import 2015-08-19 13:28:01 -04:00
Jeffrey Haines
61bb55aff4 Removed long int parameter 2015-08-19 13:23:40 -04:00
Jeffrey Haines
d91f197119 Time played display setting 2015-08-19 11:31:43 -04:00
Jeffrey Haines
69729046bf Updated parameter name to reflect units 2015-08-19 10:11:40 -04:00
Jeffrey Haines
e86891d6e1 Time played displayed in save/load menus 2015-08-19 10:05:08 -04:00
Marc Zinnschlag
9918b57341 Merge remote-tracking branch 'origin/master' 2015-08-19 16:03:01 +02:00
Jeffrey Haines
e1baf1ea48 NPCs scream when they die 2015-08-19 09:51:04 -04:00
scrawl
232dfdc07e Make an error message slightly more helpful 2015-08-19 01:24:54 +02:00
scrawl
681183df31 Restore handling of fog depth == 0 values (Bug #1549) 2015-08-19 01:13:14 +02: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
scrawl
dca08b0b42 Remove a firing assert (Fixes #2871) 2015-08-18 14:51:32 +02:00
Marc Zinnschlag
e888fd7034 Merge remote-tracking branch 'scrawl/delete_noop' 2015-08-17 18:21:56 +02:00
Marc Zinnschlag
4f4429151f Merge remote-tracking branch 'scrawl/editor_flickertypo' 2015-08-17 14:11:46 +02:00
Marc Zinnschlag
3992125b61 Merge remote-tracking branch 'scrawl/master' 2015-08-17 14:05:51 +02:00
Marc Zinnschlag
dc72b24f4e Merge remote-tracking branch 'dteviot/PathfindingRefactorDraft' 2015-08-17 14:04:56 +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
scrawl
d1e1c0f38b Editor: fix a typo in ESM::Light flag mappings 2015-08-16 23:42:08 +02:00
Marc Zinnschlag
47dd9505a9 copy meta data from game file when merging 2015-08-16 18:27:17 +02:00
scrawl
9fad33cd14 Don't reset the item model's sort/filter options in updatePlayer (Fixes #2863) 2015-08-16 17:49:53 +02:00
scrawl
c8d6679a25 Remove an unused function 2015-08-16 17:40:20 +02:00
Marc Zinnschlag
1b663f01af create merged document and open a view for it (document is still empty at this point) 2015-08-16 15:24:48 +02:00
Marc Zinnschlag
5558962b14 Merge remote-tracking branch 'scrawl/editor_creatureflag' 2015-08-16 10:13:11 +02:00
Marc Zinnschlag
8bb28c3236 Merge remote-tracking branch 'corristo/osx-hidpi' 2015-08-16 10:06:38 +02:00
dteviot
4d9d8a060d Pathing bugfix.
When path contains one one point from path grid, point is no longer being discarded.
2015-08-16 18:56:28 +12:00