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

1432 commits

Author SHA1 Message Date
Chris Robinson
9ea6b22a83 Handle soundgen animation keys 2013-07-17 23:58:21 -07:00
Chris Robinson
c7692acb79 Update the player's Ptr in mwrender when changing cells 2013-07-17 19:11:03 -07:00
Chris Robinson
f296d13c20 Add a speed multiplier to the animation state 2013-07-16 00:43:31 -07:00
scrawl
c81b852071 Fixes inaccurate ray casts; rely on getCameraToViewportRay 2013-07-15 00:39:37 +02:00
Marc Zinnschlag
602e40e19d Merge remote-tracking branch 'greye/coc' 2013-07-07 13:34:28 +02:00
greye
f3d54a7ba4 move finding default cell positions to World 2013-07-07 15:03:06 +04:00
greye
0c303aa285 fix fading on cell transition when cell is loaded 2013-07-07 14:30:11 +04:00
scrawl
744c5804ed Simplified doors, now they will stop after hitting an obstacle instead of trying to back off. 2013-07-07 03:52:17 +02:00
greye
76d95dffb6 special case for loading StartScript records 2013-07-05 23:52:46 +04:00
Marc Zinnschlag
56637a39a3 Merge remote-tracking branch 'vheuken/master' 2013-06-29 12:27:01 +02:00
Marc Zinnschlag
cd538538b5 fixed weather code 2013-06-28 09:00:21 +02:00
Vincent Heuken
f43b48015e remove actor's collisionbox on death 2013-06-27 19:42:27 -07:00
Vincent Heuken
b095c24854 resize actor collision boxes on death 2013-06-27 14:11:20 -07:00
Marc Zinnschlag
f5ba2b37e7 Merge remote-tracking branch 'vorenon/fixes' 2013-06-21 20:28:45 +02:00
vorenon
efdcd9649c Fading for Exterior->Interior cell transitions 2013-06-21 20:19:35 +02:00
Marc Zinnschlag
8b909ff838 killed a stray srand 2013-06-21 08:58:52 +02:00
Miroslav Puda
8da3494d74 Revert "Type of weather changed from string to enum." 
This reverts commit 04d90b4c47.

Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/weather.hpp
 2013-06-20 21:51:07 +02:00
Miroslav Puda
26a6bdb27d Correction of sigsegv. 2013-06-19 20:06:02 +02:00
Miroslav Puda
f9940413fd Static for nextWeather() 2013-06-19 16:49:43 +02:00
Miroslav Puda
bf31e5385c Removal of duplicit exterior checking and unneded string copiing. 2013-06-19 16:18:43 +02:00
Miroslav Puda
8a45686e0a WeatherResult added as member variable. 2013-06-19 06:50:36 +02:00
Miroslav Puda
f01aa8f55e Simpler statistical calculation of next weather; minus before parens. 2013-06-19 04:57:36 +02:00
Miroslav Puda
04d90b4c47 Type of weather changed from string to enum. 2013-06-19 03:24:30 +02:00
scrawl
705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 2013-06-12 16:07:46 +02:00
scrawl
3a6e54c4f5 Sell owned items in the cell 2013-05-27 02:18:36 +02:00
scrawl
d9dd02c610 Security fixes 2013-05-20 12:42:11 +02:00
scrawl
2715520d6f Cleanup Security class 2013-05-19 23:19:48 +02:00
scrawl
5173779f4b Add sounds for security skill 2013-05-19 19:48:51 +02:00
scrawl
7a2d1cd8ce Security skill 2013-05-19 18:40:37 +02:00
scrawl
60563afc10 Fix a new game crash, reset camera 2013-05-17 22:53:43 +02:00
Marc Zinnschlag
2c8a511179 Merge remote-tracking branch 'scrawl/persistence' 2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
Glorf
af28be915f Use fallback video name 2013-05-16 13:47:27 +02:00
Marc Zinnschlag
9fee99d56c Merge remote-tracking branch 'scrawl/master' 2013-05-15 22:43:00 +02:00
scrawl
aaa9aba999 Some fixes 2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Glorf
9fa2dd5277 Playing with moons part 2 2013-05-14 19:58:08 +02:00
Marc Zinnschlag
e14cb6853f Merge remote-tracking branch 'scrawl/containerui' 2013-05-11 19:23:02 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
Glorf
6aaa8d6dc0 Fixed fading problem 2013-05-10 19:33:43 +02:00
Glorf
9cc85cbe81 Playing with moons part 1 2013-05-10 18:55:56 +02:00
Glorf
6417fa504e Fixed constness 2013-05-09 13:56:13 +02:00
Glorf
c605f15a15 Another weather cleanup 2013-05-09 00:36:58 +02:00
Marc Zinnschlag
c80ffa0a16 Merge remote-tracking branch 'gus/AIFix' 2013-05-08 20:31:57 +02:00
gus
603af21715 little interface improvement 2013-05-07 19:42:21 +01:00
gus
a328a03bd3 more fix. Fargoth quest almost work as in vanilla now. 2013-05-07 19:35:10 +01:00
Glorf
68f249e8f4 Small weather cleanup 2013-05-07 10:27:37 +02:00
gus
006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 2013-05-06 00:46:50 +01:00
Marc Zinnschlag
d5741c7141 Merge remote-tracking branch 'scrawl/master' 2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'" 
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
 2013-05-01 16:56:16 +02:00
scrawl
1acfd849a2 Fix a case folding bug 2013-05-01 16:38:16 +02:00
Marc Zinnschlag
6f0ccb6e38 Merge remote-tracking branch 'scrawl/insertrecords' 2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0 Merge remote-tracking branch 'glorf/acrobatics' 2013-05-01 13:44:23 +02:00
scrawl
40a0969055 Insert records that may not exist in vanilla MW 2013-05-01 12:47:50 +02:00
Glorf
236ec3409f Finished acrobatics 2013-05-01 12:21:59 +02:00
scrawl
67422c397c GetWindSpeed 2013-05-01 11:42:24 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
Glorf
5a8c1661be Jump acrobatics working, started falling acrobatics implementation 2013-04-30 20:44:17 +02:00
scrawl
1420a2cb33 Tweaked adjustPosition. Now uses a very thin box for tracing the feet only. 2013-04-30 20:43:38 +02:00
scrawl
91c89e5db4 Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace 2013-04-30 20:26:59 +02:00
Marc Zinnschlag
61e476118d Merge remote-tracking branch 'kcat/animations' 2013-04-30 10:25:26 +02:00
scrawl
c0dd383cd0 Fix door collision to work with all possible movement directions 2013-04-30 09:43:32 +02:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
Marc Zinnschlag
bab899513a Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-29 18:04:22 +02:00
Glorf
74de8b83b6 Enabled collision when new game 2013-04-29 17:56:16 +02:00
Chris Robinson
d17e1e83d5 Rename MWRender's Player to Camera 2013-04-29 05:50:40 -07:00
scrawl
867c7db014 Fix wrong door sounds 2013-04-29 11:00:15 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
Chris Robinson
ba3a67f84b Don't store the player base node in MWRender::Player 2013-04-28 23:44:44 -07:00
Chris Robinson
24e503330b Merge remote-tracking branch 'zini/master' into animations 2013-04-28 09:41:31 -07:00
Marc Zinnschlag
11a45b3034 Merge remote-tracking branch 'scrawl/doors' 2013-04-28 18:22:09 +02:00
scrawl
67e5e939a1 Fix some doors 2013-04-28 17:57:36 +02:00
Marc Zinnschlag
f2a5377b2b Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-28 16:52:48 +02:00
Glorf
98baf9fac1 Bugfix #718 2013-04-28 16:36:12 +02:00
scrawl
6ecd88af14 More fixes 2013-04-28 15:59:59 +02:00
scrawl
4ee1a6ee02 Put door physics in a separate method, some fixes 2013-04-28 15:36:37 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
Marc Zinnschlag
738a54337d removed redundant case smashing 2013-04-28 14:07:53 +02:00
scrawl
fdf80c1c4f Fix unused variable 2013-04-28 11:05:01 +02:00
scrawl
db78d15fc4 Fix changeWeather 2013-04-28 11:02:30 +02:00
Chris Robinson
ce7bc20fa1 Avoid special-casing player rotation 2013-04-28 01:14:58 -07:00
Glorf
3669d0a998 Bugfix #742 2013-04-27 20:57:44 +02:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
Marc Zinnschlag
4e45222a63 Merge remote-tracking branch 'glorf/rotate-update1' 2013-04-25 20:57:24 +02:00
Glorf
240217ae42 Fixed rotations more than 360 degrees 2013-04-25 20:52:38 +02:00
Marc Zinnschlag
1e9656ee9c Merge remote-tracking branch 'glorf/rotate-update1' 2013-04-25 20:22:40 +02:00
Glorf
7cd4dd0c91 Improved local rotations 2013-04-25 19:14:10 +02:00
Marc Zinnschlag
71fc8f5830 Merge remote-tracking branch 'scrawl/item' into next 2013-04-25 10:21:14 +02:00
scrawl
9e3917881d Don't fail on nonexistent items in a levelled list 2013-04-25 04:44:30 +02:00
Nathan Jeffords
2dc01fe56b fixed the type of iterator uses in MWWorld::Store 
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
 2013-04-25 02:31:39 +02:00
Glorf
53fb17da10 Rotation system fixes 2013-04-24 21:42:04 +02:00
greye
cfccf0981d update IndexedStore::setUp() for multiple datafile support 2013-04-23 14:36:38 +04:00
scrawl
3c5e4ceefd Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9) 2013-04-18 16:46:32 +02:00
scrawl
547f77031d Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again 2013-04-17 17:06:30 +02:00
Glorf
1fd59d0ce0 Removed useless include 2013-04-16 21:21:54 +02:00
Glorf
1e92ffc314 Added rotation layer 2013-04-16 21:17:19 +02:00
Glorf
e0357c7b7c Merge rotate 2013-04-15 20:29:38 +02:00
Glorf
972481f63f Working rotate, rotateworld 2013-04-15 16:45:53 +02:00
scrawl
2693b78536 Add initial player inventory when new game is started 2013-04-15 02:56:23 +02:00
scrawl
48f46e505c Look in exterior cells first (chargen_crate_01_empty is in the prison ship but also outside of it, the one outside needs to be disabled) 2013-04-14 17:37:39 +02:00
scrawl
d50150ad71 Scale adjustment factor should not be written back to cellref scale 2013-04-13 00:13:56 +02:00
Marc Zinnschlag
beb1858a57 Merge remote-tracking branch 'glorf/bugfix' 2013-04-10 17:39:19 +02:00
Glorf
ad49d1ecab Sixth minor fix 2013-04-10 15:24:20 +02:00
Tom Mason
6ca2b1af74 fix for turning animations playing when in vanity mode 2013-04-09 19:24:41 +01:00
Glorf
bd93e63150 Fifth minor fix 2013-04-09 19:46:27 +02:00
Glorf
248fff6eb7 Fourth minor fix 2013-04-09 19:41:03 +02:00
Glorf
44ef02eb99 Third minor fix 2013-04-09 19:04:59 +02:00
Glorf
46925e93a6 Second minor fix 2013-04-09 16:14:08 +02:00
Glorf
623c2c8201 Minor fix 2013-04-09 07:45:07 +02:00
scrawl
01ae91f640 Fix several NPCs spawning in the ground 2013-04-09 01:24:17 +02:00
Glorf
7c22e123f4 Bugfix #691 changes 2013-04-08 22:10:55 +02:00
scrawl
9e08497f02 Initial container content should inherit the owner of its container 2013-04-07 22:07:04 +02:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6 Implemented levelled items 2013-04-07 21:01:02 +02:00
Glorf
48d9885554 Started bugfix #691 2013-04-05 15:42:05 +02:00
Marc Zinnschlag
034ebf8ffd Merge remote-tracking branch 'scrawl/master' 2013-04-04 19:57:55 +02:00
scrawl
2e7d5377f4 Fix crash when moving npcs to an inactive cell 2013-04-04 16:51:22 +02:00
Marc Zinnschlag
62d70f17c8 removed another redundant include 2013-04-04 12:42:38 +02:00
Marc Zinnschlag
5244362fba some cleanup 2013-04-04 12:23:06 +02:00
Marc Zinnschlag
8c7d578ddc moved the CellRef struct to its own header 2013-04-04 12:13:15 +02:00
Marc Zinnschlag
e8c32d0c3d MWWorld::Player cleanup 2013-04-04 12:05:03 +02:00
scrawl
ebaf80d539 Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change. 2013-04-03 23:55:57 +02:00
Glorf
900c2cfa81 Minor bugfix #646 change 2013-04-02 14:08:59 +02:00
Glorf
d25c838e1d Bugfix #646 2013-04-02 11:42:29 +02:00
Marc Zinnschlag
751c679255 Merge remote-tracking branch 'glorf/enchanting' 2013-04-01 17:35:04 +02:00
Glorf
d29a42dcbe Fixed enchanting mechanics 2013-03-31 23:18:23 +02:00
scrawl
1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 2013-03-31 14:50:03 +02:00
Chris Robinson
13c098266c Pass player rotation through the movement settings 2013-03-31 02:57:22 -07:00
scrawl
69099c11a2 Merge branch 'enchanting' into companion 2013-03-31 11:52:55 +02:00
Chris Robinson
18e8ff7198 Actually rotate the object when updating physics 2013-03-31 02:24:44 -07:00
Chris Robinson
7b02ec411b Apply the rotation when updating the character controller 2013-03-31 01:29:24 -07:00
scrawl
13be61812a Made the "Unknown class key" exception slightly more helpful 2013-03-31 10:16:02 +02:00
Chris Robinson
466c0086b8 Use a full Movement to hand off to the world physics update 2013-03-31 00:13:56 -07:00
Chris Robinson
0ce188b7cc Store the position and rotation in MWMechanics::Movement 2013-03-30 19:00:46 -07:00
Chris Robinson
63af72c315 Avoid converting to and from quaternions 2013-03-30 17:31:16 -07:00
scrawl
0079f62180 Gold condition now always checks RefID instead of the name. This is necessary because in the french MW version, the sGold GMST is different from the name of the gold references. 2013-03-30 16:27:06 +01:00
scrawl
51204f098e Added soulgem dialog; made interactive message boxes not close the previous UI 2013-03-30 15:51:07 +01:00
scrawl
e7af718b55 Remove unnecessary WindowManager::messageBox arguments 2013-03-30 12:56:37 +01:00
Marc Zinnschlag
573368849b Merge remote-tracking branch 'glorf/enchanting' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2013-03-29 16:48:21 +01:00
Glorf
86275e5bd4 Some enchanting fixes 2013-03-29 12:00:09 +01:00
Glorf
eb88463b94 Some enchanting fixes 2013-03-28 23:39:20 +01:00
Glorf
6643fe789c Enchanting system 2013-03-28 17:41:00 +01:00
scrawl
6f1575d42a CELL record corrections 2013-03-27 17:27:43 +01:00
Marc Zinnschlag
6c76e97bbc fixed day count in rest dialogue 2013-03-25 11:53:02 +01:00
scrawl
a2ca679beb Added PC repair feature 2013-03-23 08:16:46 +01:00
scrawl
20774f8f81 Added merchant repair feature 2013-03-22 14:13:10 +01:00
scrawl
8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 2013-03-22 12:24:09 +01:00
Marc Zinnschlag
feaf2b43fb disabled and deleted objects where not correctly ignored during adding objects to a cell when it became active 2013-03-22 09:44:59 +01:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
Marc Zinnschlag
775f9e8402 Merge remote-tracking branch 'potatoesmaster/dialogue' into next 2013-03-20 20:53:14 +01:00
Emanuel Guevel
6783ff6748 Workaround to have dialogues until actor detection is implemented for NPCs 2013-03-20 20:10:55 +01:00
scrawl
2509b34ace Enabled bloodmoon weather 2013-03-20 02:48:10 +01:00
scrawl
6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 2013-03-20 02:29:03 +01:00
scrawl
21cc7483e4 Fix broken weather transitions 2013-03-20 01:20:56 +01:00
Glorf
f5bf7254a8 Minor console selection improvements 2013-03-18 23:46:17 +01:00
Glorf
a07c910d0b Feature #535: Console object selection improvements 2013-03-18 21:33:12 +01:00
Marc Zinnschlag
08f6d04960 constness fixes 2013-03-18 08:29:40 +01:00
Marc Zinnschlag
19c3b5516d Merge remote-tracking branch 'glorf/fallbacks-next' into next 2013-03-18 08:14:25 +01:00
scrawl
95e1cdc07d Move getArmorRating to MWWorld::Class. 2013-03-17 22:29:12 +01:00
Glorf
5922637c58 Unblocked Solstheim weather that should work now. 2013-03-17 20:12:26 +01:00
Glorf
f3fd3a7691 Much more moons fallbacks 2013-03-17 19:36:14 +01:00
Glorf
1369090a80 More moons fallbacks, minor weather fixes 2013-03-17 14:50:02 +01:00
Glorf
ea7f386e7d Access to Fallback via getFallback 2013-03-17 13:50:15 +01:00
greye
52ed451ae7 fix eraseStatic() assumptions 2013-03-17 08:36:15 +04:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
scrawl
c0b0227e8a enchanting 2013-03-16 19:00:14 +01:00
Marc Zinnschlag
66a2df68db some cleanup 2013-03-15 10:26:04 +01:00
Glorf
727a598cbe Last tabulator died 2013-03-15 10:32:03 +01:00
Glorf
542c1bcc53 Some other tabulators deleted 2013-03-15 10:28:39 +01:00
Glorf
e1c6c3fe02 Tabulators deleted 2013-03-15 10:22:02 +01:00
Glorf
521bebd2f4 Fallback system rewritten, added light fallbacks 2013-03-15 10:17:30 +01:00
scrawl
5b943a965f Handle always run in the inputmanager, instead of using forced stance. 2013-03-14 21:08:19 +01:00
scrawl
2d8f0949a4 Always run key (Y) 2013-03-14 20:27:16 +01:00
greye
d30b38f336 fix Store<T>::eraseStatic() 2013-03-14 19:28:17 +04:00
scrawl
84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 2013-03-14 03:04:02 +01:00
Marc Zinnschlag
25fd7a41eb Merge remote-tracking branch 'scrawl/next' into next 2013-03-12 18:13:57 +01:00
Marc Zinnschlag
9e68a420ae restructuring tes3 record structs 2013-03-12 08:15:20 +01:00
scrawl
41a958cd4e Fix hardcoded beast races in MWClass::Npc::getModel 2013-03-12 02:50:23 +01:00
scrawl
46d8f3ce5a Fix hardcoded race IDs 2013-03-12 02:44:03 +01:00
scrawl
eeb60edb65 Properly check for the Beast flag instead of hardcoding beast races 2013-03-12 02:09:54 +01:00
scrawl
543f573739 Fix the firstguard armor mod 2013-03-12 02:02:59 +01:00
Marc Zinnschlag
bdec87e51b some cleanup 2013-03-10 11:30:50 +01:00
Marc Zinnschlag
65c382116f Merge remote-tracking branch 'glorf/master' 2013-03-10 11:24:23 +01:00
Glorf
d5ca00c927 Another fix 2013-03-10 12:11:38 +01:00
Glorf
81338d3b23 Weather code fixes 2013-03-10 11:30:24 +01:00
Marc Zinnschlag
6cef7fb610 rescale all objects to the range of [0.5, 2] when a cell becomes active 2013-03-10 10:00:20 +01:00
Glorf
aebd9a3700 Weather to pull 2013-03-10 00:24:14 +01:00
scrawl
5c94c654d4 Fix wrong rotation of objects dropped on the ground 2013-03-09 13:27:24 +01:00
scrawl
d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 2013-03-08 23:46:25 +01:00
scrawl
285b4bf726 Allow zooming camera in vanity or preview mode with the mousewheel 2013-03-08 00:12:56 +01:00
Marc Zinnschlag
17e406e58c Merge remote-tracking branch 'mikesc/bug586' 2013-03-07 20:48:58 +01:00
Michal Sciubidlo
f2f4b6e2d5 Make MWWorld::getInterior case insensitive. 
Interior cells names can use different mix of uppercase/lowercase in different places.
getInterior() should return same cell in all cases. Fixes bug #586.
 2013-03-07 20:15:01 +01:00
scrawl
66a754e9aa Fix tooltip position when hovering the crosshair over NPCs 2013-03-07 15:25:22 +01:00
scrawl
0ee0dbdb97 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 2013-03-07 14:00:13 +01:00
Marc Zinnschlag
642653d10e World constructor fixes 2013-03-06 19:57:00 +01:00
Marc Zinnschlag
7e100c36b5 Merge remote-tracking branch 'gus/AI' 2013-03-06 19:05:55 +01:00
scrawl
268bb23590 Implemented sneaking animation 2013-03-06 16:58:56 +01:00
gus
8b6f0e0770 Correct orientation sign 2013-03-05 18:28:57 +00:00
Marc Zinnschlag
d839a4c6c2 Merge remote-tracking branch 'scrawl/graphics' 2013-03-05 16:31:22 +01:00
scrawl
fe7b2732d8 Avoid manually updating render targets from within frameRenderingQueued 2013-03-05 14:24:29 +01:00
Marc Zinnschlag
dc3edc6024 Merge branch 'vartype' 2013-03-05 10:59:08 +01:00
Marc Zinnschlag
ba4907fbaf use new Variant type for GMSTs 2013-03-05 08:02:27 +01:00
Marc Zinnschlag
a93034b0a9 Merge remote-tracking branch 'k1ll/store_segfault_fix' 2013-03-04 19:27:14 +01:00
Marc Zinnschlag
a1ac20c6f3 changed global variable records to new variant type 2013-03-04 14:32:59 +01:00
gus
48b3f1e0cf Clean up. But still a little hacky 2013-03-04 12:08:35 +00:00
scrawl
359ae06fcf Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 19:35:26 +01:00
Marc Zinnschlag
123a111580 Merge remote-tracking branch 'scrawl/master' 2013-03-03 17:13:05 +01:00
scrawl
f0e3463e9b Disable assertion for comparing iterators from different containers (Bug #605) 2013-03-03 16:50:10 +01:00
scrawl
05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-03 15:14:20 +01:00
scrawl
11f21a1988 Weather update should be before renderer update 2013-03-03 15:10:40 +01:00
gus
7fb2ff18a3 Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public) 2013-03-03 13:06:45 +00:00
scrawl
0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
 2013-03-03 11:02:38 +01:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
k1ll
dde43e8c87 Some cleanup 2013-03-02 21:46:31 +01:00
Nathan Jeffords
d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 2013-03-02 10:46:12 -08:00
k1ll
9acd4061cc Fix dangling static references in mShared 2013-03-02 17:04:17 +01:00
vorenon
f66f67eaa1 Loading text uses now the corresponding GMSTs 2013-02-28 17:54:42 +01:00
vorenon
a6fb58bc59 Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell" 
This commit replaces the default "Loading Cell" text with "Loading
Interior" and "Loading Exterior"
 2013-02-28 16:31:24 +01:00
vorenon
d4aa33b9a7 Removing the unloading cells part instead of just commenting them. 2013-02-28 15:58:03 +01:00
vorenon
ffd96c7715 Removed "Unloading Cell..." text from loading screen 
OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of
the "flicker" every time a cell loads.
 2013-02-28 13:19:05 +01:00
scrawl
369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-27 09:25:44 +01:00
scrawl
d4264353a3 Merge branch 'z-up' into graphics 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/water.cpp
	files/materials/water.shader
 2013-02-26 14:54:53 +01:00
Marc Zinnschlag
dc445844d2 Merge remote-tracking branch 'scrawl/z-up' 2013-02-26 14:37:50 +01:00
Marc Zinnschlag
a7102c143f ESX variable type cleanup 2013-02-26 14:37:11 +01:00
scrawl
cd68012498 Z-up conversion: raycasts 2013-02-26 14:28:35 +01:00
scrawl
2e7bc1a368 Z-up conversion: local map, fix tcg 2013-02-26 13:39:10 +01:00
Marc Zinnschlag
bd9884b244 Merge remote-tracking branch 'chris/misc-cleanup' 2013-02-25 19:45:09 +01:00
Marc Zinnschlag
08f13ef5ab Merge remote-tracking branch 'greye/master' 2013-02-25 19:34:03 +01:00
greye
661fd73c6e fix rotation for objects in inactive cells and forced vanity mode 2013-02-25 22:00:50 +04:00
Chris Robinson
48271e49ec Properly update the Ptr object in the mechanics manager when moving across cells 2013-02-25 09:57:34 -08:00
scrawl
b1fc68d44d Merge branch 'master' into graphics 2013-02-25 17:36:33 +01:00
scrawl
355390429e Fix World::isUnderwater to use dynamic waterlevel 2013-02-25 17:27:50 +01:00
Chris Robinson
5d5d28c06c Increase the ID cache to 40 
Helps improve performance with Tribunal and Bloodmoon's scripts
 2013-02-25 07:43:56 -08:00
scrawl
cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 2013-02-25 15:12:03 +01:00
scrawl
a3afb91485 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 18:04:51 +01:00
Chris Robinson
94be45e07e Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 06:20:10 -08:00
ChrisKCat
aab7cf137b Merge pull request #5 from greye/cross-cell 
fix and unify object cell change update in mwrender
 2013-02-24 05:32:52 -08:00
Marc Zinnschlag
fa880e3274 Merge remote-tracking branch 'lazydev/master' 2013-02-24 14:07:52 +01:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
Chris Robinson
89d4c245e9 Better calculate jump velocity 
The fatigue term isn't currently used correctly
 2013-02-24 03:30:33 -08:00
greye
6a8c532244 fix and unify object cell change update in mwrender 2013-02-24 15:04:56 +04:00
scrawl
3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 10:06:04 +01:00
Chris Robinson
90cb9ee0ac Don't set a vertical velocity when on the ground 2013-02-23 16:30:11 -08:00
lazydev
a5ff8181b7 fix for https://bugs.openmw.org/issues/569 2013-02-24 03:35:43 +04:00
Marc Zinnschlag
9e8d0128e0 Merge remote-tracking branch 'blunted2night/size_t-warnings_v2' 2013-02-23 20:06:27 +01:00
Nathan Jeffords
44b1c66c4b fixed various warnings about converting size_t to int 2013-02-23 10:23:38 -08:00
Chris Robinson
0148db8ccf Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
 2013-02-23 05:59:35 -08:00
scrawl
4b51184ec4 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 14:37:28 +01:00
greye
d983ed5c78 fix invalid SceneNode pointer on cell change 2013-02-23 16:45:55 +04:00
Chris Robinson
9c3af5f344 Do not interpret noclip mode as flying 2013-02-22 01:26:30 -08:00
Chris Robinson
4eb8ea0c95 Fix stepping and vertical force accumulation 2013-02-20 07:51:36 -08:00
Chris Robinson
b14def7c09 Set the character as being on the ground when colliding with a shallow enough slope 2013-02-20 05:24:38 -08:00
Chris Robinson
fe6fa9ebe7 Simplify newtrace a bit 2013-02-20 04:14:52 -08:00
Chris Robinson
cfdc820a1f Make an actor fly when it has a levitate effect 2013-02-20 01:55:12 -08:00
Chris Robinson
5d55b41714 Remove a now-unneeded(?) hack 2013-02-19 04:59:38 -08:00
Chris Robinson
89fabdb3a9 Update the PhysicActor's RigidBody when moving 
This works, but is less than ideal. As it is now, the rigid body gets updated
twice as the position and rotation are set separately. They should instead be
updated together.
 2013-02-19 04:18:15 -08:00
Chris Robinson
a510adc572 Allow stepping when not being affected by gravity 2013-02-19 02:25:57 -08:00
Chris Robinson
c694161272 Don't try to step if not on the ground 2013-02-19 01:28:02 -08:00
Chris Robinson
5a1a0b7338 Add and use an MWWorld::isFlying method 2013-02-18 22:39:43 -08:00
scrawl
5d403ebdd3 Fix collision debug drawer (tcg) 2013-02-19 04:03:24 +01:00
scrawl
32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-19 00:15:54 +01:00
Chris Robinson
bea460955d Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 16:03:39 -08:00
scrawl
00db13be32 Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed. 2013-02-17 15:56:22 +01:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
scrawl
373de19aee Removed dialogue fix again, now on separate branch 2013-02-17 03:02:47 +01:00
scrawl
df8e502f8c Ouch, I used && instead of &, this broke actions without a sound 2013-02-17 02:52:49 +01:00
scrawl
a5c8d5748f fix FailedAction. 2013-02-16 18:05:25 +01:00
scrawl
0bc34c1c0d Action::executeImp returns a bool value to indicate if the sound should be played. 2013-02-16 16:40:44 +01:00
scrawl
7d918caa93 Don't allow dialogue if player controls are disabled. 2013-02-16 16:26:40 +01:00
Douglas Mencken
eb09662f1d Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead. 
It is boost headers' job to deal with their internals.
 2013-02-16 14:49:11 +01:00
Chris Robinson
158e18b98d Remove an unused method 2013-02-16 00:30:07 -08:00
Chris Robinson
c965bd8e18 Increase step size to 30 2013-02-15 17:22:55 -08:00
Chris Robinson
c57001e3bd Remove an unused field 2013-02-15 05:11:06 -08:00
Chris Robinson
ac717373b1 Add a method to check if an object is on the ground 2013-02-14 22:35:15 -08:00
Chris Robinson
18b606fddf Use the PhysicActor's set/getOnGround method 2013-02-14 20:10:04 -08:00
Chris Robinson
15dc82f454 Increase step size to 15 2013-02-14 18:59:05 -08:00
Chris Robinson
a729b1b12a Snap to the ground after moving 
Depends on two factors:
* End up close enough above to a walkable plane (it's within sMaxStep units
  down and is angled sMaxSlope or less)
* Started out on the ground without any upward movement

This also reduces the distance needed to be to the ground to 4 (from 10), and
ensures the actor is 2 units above the ground when on it. Downward force is
also removed when starting on the ground.
 2013-02-14 18:34:51 -08:00
Chris Robinson
34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 2013-02-09 09:46:57 -08:00
scrawl
d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-09 16:40:10 +01:00
Marc Zinnschlag
f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 2013-02-09 15:30:29 +01:00
Mark Siewert
55bd9eef66 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2013-02-09 13:03:35 +01:00
Mark Siewert
eefbdde6de - For pull request: remove all instances of maps used to track refnumbers. 
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
 2013-02-09 13:00:57 +01:00
scrawl
6805c7bab4 Merge branch 'master' into graphics 2013-02-08 18:35:41 +01:00
Chris Robinson
f5afa43db5 Remove an unneeded parameter 2013-02-07 17:45:41 -08:00
Chris Robinson
d47d2216f2 Use some const references where appropriate 2013-02-07 16:33:44 -08:00
Chris Robinson
cbdd459500 Remove unneeded playerMove from PhysicActor 2013-02-07 15:48:41 -08:00
Chris Robinson
ca6f8b6d88 Reorganize a bit of code in the movement solver 2013-02-07 13:18:16 -08:00
Chris Robinson
fe0e6c452d Remove the unneeded playerMove object from PhysicsSystem 2013-02-07 12:11:10 -08:00
Chris Robinson
8de2d24d0e Restore old ground check 2013-02-06 21:57:59 -08:00
Chris Robinson
923d0d6eb4 Fix up some header includes 2013-02-06 21:47:09 -08:00
Chris Robinson
e577ee2de8 Add a method to set/retrieve being on the ground 2013-02-06 21:44:58 -08:00
Chris Robinson
a8f0ce43a5 Add a run key 2013-02-06 17:51:47 -08:00
Chris Robinson
bdda7278c4 Use 3/4ths of the physic actor's height to test if swimming 2013-02-06 12:56:30 -08:00
Chris Robinson
dfd16c4424 Fix movement rotations 2013-02-06 12:39:26 -08:00
Marc Zinnschlag
43912f927a Merge remote-tracking branch 'potatoesmaster/importer' into next 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-02-06 10:12:40 +01:00
Chris Robinson
9cf30f39bd Don't apply gravity when swimming 2013-02-05 19:45:51 -08:00
Chris Robinson
e217a3d25c Silence some console spam 2013-02-05 15:51:26 -08:00
Chris Robinson
ee3764e9b3 Increase max slope to 60. 45 is too low. 2013-02-05 15:07:48 -08:00
Chris Robinson
8c0bb1ff4d Rotate movement in the movement solver 2013-02-05 14:02:14 -08:00