mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 04:26:38 +00:00
Code Issues Releases Wiki Activity
5948 commits 115 branches 76 tags 128 MiB
Commit graph

4205 commits

Author SHA1 Message Date
vorenon
b1ca719d61 Added click sound to OK button for message boxes 2013-02-26 16:37:59 +01:00
vorenon
1a43d86d9e Close messages boxes with the activation key (Bug #589) 2013-02-26 15:58:32 +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
b9912a19e0 Z-up conversion: fix player arrow direction on global map 2013-02-26 14:31:30 +01:00
scrawl
cd68012498 Z-up conversion: raycasts 2013-02-26 14:28:35 +01:00
scrawl
cc9b72b9b1 Removing some leftovers of mwRoot node 2013-02-26 14:01:10 +01:00
scrawl
341f9b96e2 Local map: restore zHigh 2013-02-26 13:53:23 +01:00
scrawl
284ba58e1e Z-up conversion: global map, shader fix 2013-02-26 13:52:01 +01:00
scrawl
2e7bc1a368 Z-up conversion: local map, fix tcg 2013-02-26 13:39:10 +01:00
scrawl
5c0c5854e8 Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not 2013-02-26 12:01:10 +01:00
scrawl
3ef952172d Z-up conversion: water, sky 2013-02-26 10:38:48 +01:00
scrawl
3cb3ec91c0 Z-up conversion: camera 2013-02-26 09:12:35 +01:00
scrawl
a5451eb9d9 Z-up conversion: terrain, objects 2013-02-26 08:30:06 +01:00
Chris Robinson
955e2713a9 Fix encumbrance term calculation 2013-02-25 17:29:32 -08:00
Chris Robinson
a576e9e430 Set the race selection character preview in a valid (idle) pose. 2013-02-25 16:40:08 -08:00
Chris Robinson
9679daa6a4 Merge remote-tracking branch 'zini/master' into misc-cleanup 2013-02-25 13:10:21 -08:00
Chris Robinson
da575b181e Use the correct GMST for the race menu 2013-02-25 13:04:17 -08:00
Pieter van der Kloet
b209b6a0e6 Added missing includes 2013-02-25 22:00:51 +01:00
Pieter van der Kloet
469d608f51 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 21:26:54 +01:00
Pieter van der Kloet
9cd8dd39de Make the launcher code conform to the coding standards and cleanup 2013-02-25 21:22:07 +01:00
Marc Zinnschlag
bd9884b244 Merge remote-tracking branch 'chris/misc-cleanup' 2013-02-25 19:45:09 +01:00
Chris Robinson
000128d084 Merge remote-tracking branch 'zini/master' into misc-cleanup 2013-02-25 10:38:08 -08:00
Marc Zinnschlag
08f13ef5ab Merge remote-tracking branch 'greye/master' 2013-02-25 19:34:03 +01:00
Marc Zinnschlag
fa45def475 Merge remote-tracking branch 'scrawl/master' 2013-02-25 19:30:30 +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
8aff033a0c Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog 2013-02-25 18:29:11 +01: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
Marc Zinnschlag
88e8659a49 minor cleanup 2013-02-25 16:52:31 +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
73d48a95f6 Add message box when the player tries to move when being overencumbered. 2013-02-25 16:31:48 +01: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
Marc Zinnschlag
cd40d167ce Merge remote-tracking branch 'chris/animation2' 2013-02-25 14:56:03 +01:00
scrawl
dfe29db9cb Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation) 2013-02-25 06:57:32 +01:00
Pieter van der Kloet
c4ebdc230c Cleaned up strings and indentation 2013-02-25 01:28:13 +01:00
Pieter van der Kloet
a0007325ad Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins 2013-02-25 01:22:14 +01:00
Pieter van der Kloet
6eaaf20c94 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 00:56:23 +01:00
Pieter van der Kloet
17a0a201df Various fixes and changes to the settings handling 2013-02-25 00:56:04 +01:00
Chris Robinson
000236ba80 Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 15:30:46 -08:00
Chris Robinson
74b8095fc7 Use default parameters where appropriate 2013-02-24 14:43:20 -08:00
Chris Robinson
5267d17408 Revert "forgot to destroy child scene nodes" 
This reverts commit f1a3309392.

Unneeded. The caller already calls this which destroys the children recursively
 2013-02-24 14:14:08 -08:00
ChrisKCat
9e7b559b09 Merge pull request #6 from scrawl/lights 
For light objects without an AttachLight bone, attach the light to the c...
 2013-02-24 14:12:53 -08:00
scrawl
f1a3309392 forgot to destroy child scene nodes 2013-02-24 19:03:25 +01:00
scrawl
1ae2d3c6ab For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin. 2013-02-24 19:00:06 +01:00
Nathan Jeffords
7ea1f6a02a fixes for using FFMPEG on windows 2013-02-24 09:42:08 -08: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
0d6a3367d3 Water shader no longer depends on object shaders being enabled 2013-02-24 10:28:50 +01:00
scrawl
3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 10:06:04 +01:00
Pieter van der Kloet
919d1ee572 Some fixes to the settings handlers 2013-02-24 04:14:18 +01:00
Pieter van der Kloet
4737b20e4c Fixed a bug in the combobox popup font size, items overlapping 2013-02-24 04:00:22 +01:00
Pieter van der Kloet
be43fa334f Added support for non-latin characters, fixes Bug #515 2013-02-24 03:14:19 +01:00
Pieter van der Kloet
9198afeefb Improved context menu, added context menu for masters and added multi-selection support 2013-02-24 03:10:27 +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
Chris Robinson
8e59ea4941 Use a separate method to handle animation events 2013-02-23 14:39:01 -08:00
Pieter van der Kloet
150d4a7a72 Added support for multiple ini files 2013-02-23 23:18:42 +01:00
Chris Robinson
d77d035d3a Handle the "sound" events in runAnimation 2013-02-23 14:15:11 -08:00
Chris Robinson
df8889dcc4 Limit maximum frame time to 200ms 
This effectively slows game time when it drops below 5 fps. Something like this
is desirable when dealing with time-based animations, which can jump forward
after a lengthy cell transition.
 2013-02-23 13:15:37 -08:00
Marc Zinnschlag
9a03b17b2d Merge branch 'localworkaround' 2013-02-23 20:50:22 +01:00
Marc Zinnschlag
a95431c387 fix 2013-02-23 20:20:40 +01: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
d208422ca7 Add a method to update an Animation's Ptr object 2013-02-23 10:12:36 -08:00
Marc Zinnschlag
d98ec67671 Merge remote-tracking branch 'graffy76/recentfiles' 2013-02-23 18:53:33 +01:00
Chris Robinson
a2eaec7878 Avoiding holding the InventoryStore in the NpcAnimation class 2013-02-23 08:03:52 -08:00
Chris Robinson
0d0e75fe0b Don't set animation sources for models that don't have a skeleton 2013-02-23 07:36:11 -08:00
graffy76
89dace3cc3 Fix for operations widget - hides when no operations are running. 2013-02-23 09:07:13 -06: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
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
Pieter van der Kloet
63a13cf9ca Whoops, removed an include 2013-02-20 19:29:12 +01:00
Pieter van der Kloet
18d01cd65a Implemented a first-run dialog to import Morrowind.ini settings 2013-02-20 19:27:04 +01: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
Pieter van der Kloet
2172fb4229 Added checkable message box class 2013-02-19 16:41:33 +01:00
Pieter van der Kloet
35b68a3c40 Fixed accidental profile deletion and added sorting by date 2013-02-19 15:58:01 +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
Pieter van der Kloet
37fe31e858 Merge remote-tracking branch 'upstream/next' into settings_selwidget 2013-02-19 01:12:47 +01:00
scrawl
32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-19 00:15:54 +01:00
Pieter van der Kloet
bcf4f96209 Added writing masters/plugins to openmw.cfg 2013-02-18 23:10:50 +01:00
Pieter van der Kloet
178cf2154e Made checking/unchecking work with the new datafiles model 2013-02-18 17:59:08 +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
Pieter van der Kloet
fd430dc5a9 Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget 
Conflicts:
	apps/launcher/datafilespage.cpp
	components/fileorderlist/datafileslist.cpp
 2013-02-15 15:38:30 +01:00
Pieter van der Kloet
ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp
 2013-02-15 15:21:14 +01:00
Pieter van der Kloet
0e143b1926 Merge remote-tracking branch 'upstream/master' into settingsparser 2013-02-15 14:45:19 +01:00
Pieter van der Kloet
43e9ad8733 The text color of the profiles dialog now turns red on invalid names 2013-02-15 14:26:09 +01:00
Pieter van der Kloet
990895fd2b Mainwindow size and position now gets saved/restored 2013-02-15 14:12:25 +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
Pieter van der Kloet
1b9cf8c23f More work on integrating the settings parser, profiles are handled correctly 2013-02-15 01:20:48 +01:00
scrawl
7604fb51b6 CG no longer listed in the settings if the plugin isn't loaded. 2013-02-14 23:17:21 +01:00
Pieter van der Kloet
5d1bede9e5 Forgot to add two files 2013-02-14 11:20:47 +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