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

4059 commits

Author SHA1 Message Date
Marc Zinnschlag
3472a6f180 workaround for infinite recursion during local variable access 2013-02-23 14:40:56 +01:00
scrawl
4b51184ec4 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 14:37:28 +01:00
Chris Robinson
e6da9dfae5 Specify the animation key to stop playing at 2013-02-23 05:15:10 -08:00
Marc Zinnschlag
59748a7647 Merge remote-tracking branch 'greye/cross-cell' 2013-02-23 13:55:31 +01:00
Sergey Shambir
a3adcf752d TradeWindow: fixed coding style 
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
 2013-02-23 13:51:21 +01:00
greye
ac7095537f remove insertMesh() call on object cell change 2013-02-23 16:50:37 +04:00
greye
d983ed5c78 fix invalid SceneNode pointer on cell change 2013-02-23 16:45:55 +04:00
greye
9659b4a95e update NpcAnimation inventory reference on cell change 2013-02-23 16:45:55 +04:00
Marc Zinnschlag
868916a9a2 added add-on global variables in the same way add-on GMSTs were added 2013-02-23 12:51:45 +01:00
Marc Zinnschlag
6f5a772d02 fixed another case handling problem 2013-02-23 12:35:05 +01:00
Chris Robinson
b8f5813609 Set all animation sources at once 2013-02-23 03:34:03 -08:00
Marc Zinnschlag
c9ca565462 removed a redundant function call 2013-02-23 12:05:09 +01:00
Chris Robinson
f841576bba Don't override animations played with playgroup 2013-02-23 01:54:46 -08:00
scrawl
7e816c826b Fix lights without a mesh 2013-02-23 09:17:12 +01:00
scrawl
01102f9c73 Don't emit if there wasn't enough movement 2013-02-23 05:53:20 +01:00
graffy76
6f89d453a5 Operations widget height fix and abort button feature. Successfully 
tested resizing of Operations QDockWidget for multiple concurrent
operations.
 2013-02-22 21:53:32 -06:00
scrawl
5b099393fa Fix time factor 2013-02-23 04:43:51 +01:00
scrawl
db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 04:13:51 +01:00
scrawl
f17ea109ca Fix light positions 2013-02-23 04:06:05 +01:00
Chris Robinson
b12c6a4c16 Fix character preview 2013-02-22 11:16:00 -08:00
Chris Robinson
ecbf1568a1 Fix NPC part attachment 2013-02-22 10:15:29 -08:00
Chris Robinson
9dee2a72cd Use a separate method to calculate animation velocity 2013-02-22 09:22:06 -08:00
Chris Robinson
3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 2013-02-22 01:34:22 -08:00
Chris Robinson
84227caa0c Cleanup Npc::getSpeed a little 2013-02-22 01:30:06 -08:00
Chris Robinson
7ec73c29f2 Do not return the player's Animation object for non-players 2013-02-22 01:27:26 -08:00
Chris Robinson
9c3af5f344 Do not interpret noclip mode as flying 2013-02-22 01:26:30 -08:00
lazydev
71e5369f04 Loading translation data for all the plugin files, not only for the first one 2013-02-22 02:18:54 +04:00
Chris Robinson
7fcca180b6 Implement rudimentary jumping 2013-02-20 20:08:04 -08:00
Chris Robinson
bbde0146a7 Merge remote-tracking branch 'zini/master' into animation2 2013-02-20 08:27:40 -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
617158afcd Ensure updated skeleton bone placement matches in world space 
Objects attached to actors (shirts, robes, etc) do not require the same node
hierarchy as the character root. So to ensure proper placement, we need to set
the bone target's derived transformation using the source bone's derived
transformation (which in turn means we need to work up from the root, to ensure
the bone's parents are properly placed).
 2013-02-20 02:41:46 -08:00
Chris Robinson
cfdc820a1f Make an actor fly when it has a levitate effect 2013-02-20 01:55:12 -08:00
Emanuel Guevel
3dc28baa28 Remove "PinToggle" event from layout file 2013-02-20 01:31:10 +01:00
Emanuel Guevel
3ba3c71556 Make the "lock window" button to change state visually 2013-02-20 01:30:39 +01:00
Emanuel Guevel
43d6392921 Change the way pinnable window are made visible 
This ensure pinned window are not displayed in main menu, dialogue and
container mode.
 2013-02-20 01:00:13 +01:00
Chris Robinson
8196694c08 Avoid applying the animation when resetting it 2013-02-19 06:04:25 -08:00
Chris Robinson
f8349a04bf Use the looping portion of the animation to calculate the velocity 2013-02-19 05:26:58 -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
1399a06c76 Update animation looping when setting the same state 2013-02-19 04:01:33 -08:00
Chris Robinson
a510adc572 Allow stepping when not being affected by gravity 2013-02-19 02:25:57 -08:00
Chris Robinson
8255a64bfe Handle levitate and swift swim effects 2013-02-19 02:10:36 -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
Chris Robinson
17200cb226 Don't try to move when there's no speed 2013-02-18 20:43:55 -08:00
scrawl
5d403ebdd3 Fix collision debug drawer (tcg) 2013-02-19 04:03:24 +01:00
scrawl
427152c518 Disabled ripples until we can properly trigger them from the new character controller. 2013-02-19 03:15:31 +01:00
scrawl
6cceb04adf When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections. 2013-02-19 03:08:00 +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
627b866744 Don't try to set a new state when dead 2013-02-18 06:29:16 -08:00
Chris Robinson
f2948ced23 Allow diagonal movement 2013-02-18 03:07:31 -08:00
Marc Zinnschlag
0713afb97d Merge branch 'gmstfixing' into next 2013-02-18 09:24:22 +01:00
Marc Zinnschlag
a50ff34774 better default value for string GMSTs 2013-02-18 09:23:14 +01:00
scrawl
42883ec64b cleanup 2013-02-18 02:33:53 +01:00
Chris Robinson
bea460955d Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 16:03:39 -08:00
Marc Zinnschlag
1343c2c22b Merge remote-tracking branch 'scrawl/next' into next 2013-02-17 20:29:45 +01:00
scrawl
b52df83d84 Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again 2013-02-17 20:23:22 +01:00
Marc Zinnschlag
e5149e57ac Merge remote-tracking branch 'scrawl/next' into next 2013-02-17 20:04:18 +01:00
Marc Zinnschlag
475f4f9311 implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified 2013-02-17 20:03:39 +01:00
scrawl
52d0f0b750 Fixed OpAddItem, OpRemoveItem 2013-02-17 19:44:00 +01:00
Marc Zinnschlag
abd307d70e Issue #567: workaround for crash with non-English ESX files 2013-02-17 19:26:01 +01:00
scrawl
e1ca0a15ae Add message box when item is added to player's inventory 2013-02-17 18:58:54 +01:00
scrawl
170a9762ac Fix travel services not actually costing gold. 2013-02-17 18:30:21 +01:00
scrawl
791d16bbdb Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes 2013-02-17 18:12:38 +01:00
Marc Zinnschlag
31bfe62bbc Merge remote-tracking branch 'scrawl/bug_562' into next 2013-02-17 17:41:19 +01:00
Marc Zinnschlag
9221c861c5 Merge remote-tracking branch 'graffy76/next' into next 
Conflicts:
	apps/opencs/CMakeLists.txt
 2013-02-17 17:38:33 +01:00
Marc Zinnschlag
bb990b96bf Merge branch 'globaltype' into next 2013-02-17 17:27:41 +01:00
Marc Zinnschlag
50d61a5b6e proper implementation of gmst type column 2013-02-17 17:27:25 +01:00
scrawl
7ffcfa3622 Water and clouds no longer depend on timescale. 2013-02-17 16:23:55 +01:00
scrawl
5a11ddc485 Pressing F1 again hides the quick keys menu. 2013-02-17 16:01:36 +01:00
scrawl
d899f33444 Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now. 2013-02-17 16:00:31 +01: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
graffy76
ceefae81e8 fix for the opencs icon 2013-02-17 07:46:50 -06:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
Marc Zinnschlag
44d66cbf5a Merge remote-tracking branch 'scrawl/bug_562' into next 2013-02-17 09:09:31 +01:00
Marc Zinnschlag
448293f270 Merge remote-tracking branch 'scrawl/bug_559' into next 2013-02-17 09:09:06 +01:00
Marc Zinnschlag
b8c0c94d5f Merge remote-tracking branch 'wareya/master' into next 2013-02-17 08:58:41 +01:00
scrawl
c4f17f5596 playercontrols switch now disables activation in general (Chris' suggestion) 2013-02-17 03:03:41 +01: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
Wareya
c98a815581 Remove debug printing from previous commit 2013-02-16 13:37:25 -05:00
Wareya
f0220fb06b Implement "Rest Until Healed" 
Fixes: https://bugs.openmw.org/issues/563
 2013-02-16 13:35:03 -05: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
Marc Zinnschlag
910858c300 Merge remote-tracking branch 'sergeyshambir/guiconvience' into next 2013-02-16 14:50:42 +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
Douglas Mencken
a3e421167b esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel 
Signed chars, unsigned chars... Just use int for index everywhere.
 2013-02-16 14:48:44 +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
Douglas Mencken
df5919f2c5 Use `signed char' explicitly where needed. It is important because: 
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
  and unsigned char.
- Assuming that char is always unsigned or signed can lead to
  compile-time and run-time errors.

You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).

Conflicts:

	components/esm/loadcell.hpp
 2013-02-15 20:28:14 +01:00
scrawl
4da11a96a5 Fixed gold ref count always becoming 1 when dropped on the ground 2013-02-15 17:34:55 +01:00
Chris Robinson
c57001e3bd Remove an unused field 2013-02-15 05:11:06 -08:00
Chris Robinson
e4341525c8 Add a jump state 
Currently unused
 2013-02-15 04:45:28 -08:00
Chris Robinson
ff0099fa6e Scale the animation speed based on the animation velocity and movement speed 
This may not be totoally correct since it takes the whole animation into
account, rather than just the looping portion. But it's good enough for now.
 2013-02-15 02:15:39 -08:00
Chris Robinson
e1a1530774 Better implement Npc::getSpeed 2013-02-15 01:27:57 -08:00
Chris Robinson
3348e8a436 Clarify a comment 2013-02-14 22:41:14 -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
scrawl
7604fb51b6 CG no longer listed in the settings if the plugin isn't loaded. 2013-02-14 23:17:21 +01:00
scrawl
6a49ea9b4f Cleaning out some old bits 2013-02-13 18:39:36 +01:00
Chris Robinson
6a9755778e Merge remote-tracking branch 'zini/next' into animation2 2013-02-12 18:14:46 -08:00
scrawl
de90b911c9 Near clip plane corrections 2013-02-12 20:56:00 +01:00
scrawl
d213ff680f Disabled terrain LOD 2013-02-12 20:55:45 +01:00
Marc Zinnschlag
5e3529783d Merge remote-tracking branch 'ace/win-fixes' into next 2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson
bbb845824d Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__ 2013-02-12 13:59:24 +01:00
Alexander "Ace" Olofsson
0ae01794f1 Fixed build errors in OpenCS 2013-02-12 13:57:16 +01:00
Sergey Shambir
7d7a1119da Fixed book text misalignment, at least in some cases 
https://bugs.openmw.org/issues/284
 2013-02-12 11:49:20 +04:00
Sergey Shambir
03803f19b5 BookTextParser: moved to Ogre::UTFString 
Font height and unicode characters glyph width now accounted correctly.
 2013-02-12 11:22:19 +04:00
Sergey Shambir
3b64389668 BookTextParser: fixed infinitive loop 2013-02-12 11:14:30 +04:00
Marc Zinnschlag
1a079ec8d3 Merge branch 'master' into next 2013-02-11 19:53:51 +01:00
Marc Zinnschlag
1fd7d8ed2a Merge remote-tracking branch 'graffy76/master' into next 2013-02-11 15:35:59 +01:00
graffy76
55dd17c27c Added setBarColor() function to CSVDoc::Operation. Created four color 
types for existing operations (save, verify, compile and search), with a
default for future / undefined ops.
 2013-02-11 04:30:16 -06:00
Marc Zinnschlag
64d9d9e2ce Merge remote-tracking branch 'wheybags/master' into next 2013-02-10 17:29:28 +01:00
Marc Zinnschlag
eb6590f7d8 added delegate factory 2013-02-10 17:21:25 +01:00
Tom Mason
c32c31f6d6 break after activating button 2013-02-10 15:41:02 +00:00
Tom Mason
158c6fc9fa pressing enter when a messagebox is prompting for "ok", will activate ok button 2013-02-10 14:58:46 +00:00
Sergey Shambir
59808c3e10 GUI: Birth and Class dialogs now both select 1st item in list at first 
time.
 2013-02-10 08:59:38 +04:00
Sergey Shambir
725bfe6372 TradeWindow: balance now changes per time if user holds +/- button 
pressed
 2013-02-10 08:50:36 +04:00
Sergey Shambir
bba024d6ad Right mouse button click now stops Container GuiMode. 2013-02-10 08:37:45 +04:00
Chris Robinson
4ee5857bae Filter accumulation axis for mLastPosition as needed 2013-02-09 19:09:56 -08:00
Chris Robinson
8d6f017f17 Remove an unneeded Animation field 2013-02-09 13:25:39 -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
Marc Zinnschlag
2d937cd9e2 Merge branch 'gmst' into next 2013-02-09 15:26:25 +01:00
Marc Zinnschlag
d40ee06897 fixed base/modified logic 2013-02-09 15:25:50 +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
Marc Zinnschlag
828695f295 added value column to gmst table 2013-02-08 14:48:38 +01:00
Marc Zinnschlag
cce2d63433 added type column to gmst table 2013-02-08 12:20:03 +01:00
Marc Zinnschlag
d5dd0640c7 basic gmst support 2013-02-08 09:58:19 +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
Nikolay Kasyanov
0d4b0bfd93 Trying to resolve sound issues on OS X with ffmpeg backend 2013-02-07 23:40:20 +04:00
Marc Zinnschlag
dd2b7d5c63 handle deleted records 2013-02-07 13:26:00 +01:00
Marc Zinnschlag
c1cd8305bc a bit of cleanup for the previous commit 2013-02-07 13:13:06 +01:00
Marc Zinnschlag
21733e8181 hide startup dialogue when opening open dialogue 2013-02-07 13:11:41 +01:00
Marc Zinnschlag
adcaea464b basic globals record loading 2013-02-07 12:52:01 +01:00
Marc Zinnschlag
7d112e4d5c rewrote logic of content file loading 2013-02-07 11:33:08 +01: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