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

5582 commits

Author SHA1 Message Date
Emanuel Guevel
4685aea2a1 mwiniimport: ignore empty values 2013-08-03 00:21:05 +02:00
vorenon
aa45127895 Adjusted swish sounds 
Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.
 2013-08-02 16:33:39 +02:00
Marc Zinnschlag
d2f96deb98 renamed columns.hpp to columimp.hpp 2013-08-02 10:42:52 +02:00
Chris Robinson
f57c829cba Play the appropriate swish sound and follow-up animation 2013-08-02 00:21:02 -07:00
Chris Robinson
b70975a74d Move getEvasion to CreatureStats 2013-08-02 00:21:01 -07:00
Chris Robinson
9e7d670745 Inline Class::get(const Ptr& ptr) 2013-08-02 00:20:59 -07:00
Marc Zinnschlag
ca94d1a2fb Merge remote-tracking branch 'swick/inventorypos' 
Conflicts:
	apps/openmw/mwgui/inventorywindow.cpp
 2013-07-31 22:16:56 +02:00
Marc Zinnschlag
24273f338b Merge remote-tracking branch 'scrawl/master' 2013-07-31 22:12:07 +02:00
Sebastian Wick
7ed763262f GUI mode dependent position 2013-07-31 21:40:29 +02:00
scrawl
fe51a00112 Fix the initial player inventory being added twice when starting a new game 2013-07-31 21:00:58 +02:00
scrawl
f1f6336a4a Fixed screenshot keybinding, and make it bindable 2013-07-31 20:24:44 +02:00
Marc Zinnschlag
5cafe65cd7 Merge remote-tracking branch 'scrawl/cppcheck' 2013-07-31 20:00:35 +02:00
scrawl
d106ed3b08 Fixed alchemy 2013-07-31 19:03:51 +02:00
Marc Zinnschlag
4dfd5282ab Merge remote-tracking branch 'kolek/enchantingwindow' 2013-07-31 19:01:49 +02:00
Marc Zinnschlag
25917b00ec Merge remote-tracking branch 'scrawl/master' 2013-07-31 19:00:24 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
scrawl
43e0df479e Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping 2013-07-31 16:30:22 +02:00
PLkolek
f297c21e4d Old door sound fades out on door open/close. Door sound is synchronised to angle on action. 2013-07-31 15:46:23 +02:00
PLkolek
8bc8c38f2d Spell cost is updatedon every change in enchanting and spellmaking. 2013-07-31 13:33:30 +02:00
PLkolek
7fd7621458 Fixed area slider in self enchantments. 2013-07-31 12:26:34 +02:00
Marc Zinnschlag
6ce2b962e1 Merge remote-tracking branch 'scrawl/inventory' 2013-07-31 09:15:22 +02:00
Marc Zinnschlag
eedced729f Merge remote-tracking branch 'scrawl/master' 2013-07-31 09:14:12 +02:00
Marc Zinnschlag
7639506e49 Merge remote-tracking branch 'scrawl/ai' 2013-07-31 09:07:46 +02:00
scrawl
16cacb338a Initialize MWMechanics::AiSequence from ESM::AiPackageList 2013-07-31 00:55:08 +02:00
scrawl
45006ea193 Fix inventory/container content loading so that it's done for dynamically spawned objects as well 2013-07-31 00:02:24 +02:00
scrawl
90a5d8b6f5 Fix uninitialized AL listener position/orientation when the game is paused during the first frame 2013-07-30 23:24:18 +02:00
Marc Zinnschlag
958b0c4915 Merge remote-tracking branch 'scrawl/untilhealed' 2013-07-30 22:41:05 +02:00
scrawl
da01ec4f52 Only show the "Rest until healed" button when stats are not full 2013-07-30 22:07:27 +02:00
scrawl
04b90b7d14 Other actors no longer collide with an actor that has collision disabled 2013-07-30 22:00:48 +02:00
scrawl
472a381263 Fix health meter (again) 2013-07-30 16:09:12 +02:00
Marc Zinnschlag
adb05737ee Merge branch 'master' into filter 
Conflicts:
	apps/opencs/model/world/universalid.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/subviews.cpp
 2013-07-30 15:55:50 +02:00
Marc Zinnschlag
2e667f1d94 Merge branch 'bottombar' 2013-07-30 12:55:12 +02:00
Marc Zinnschlag
434f97c95c fixed two missing icons 2013-07-30 12:55:02 +02:00
Marc Zinnschlag
102700a498 added specialised Creator for references 2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce added specialised Creator for referenceable records 2013-07-30 12:34:18 +02:00
Marc Zinnschlag
3642562959 Merge remote-tracking branch 'scrawl/master' 2013-07-30 08:11:40 +02:00
scrawl
426e3ec6c6 Fix enemy health meter for creatures 2013-07-30 06:17:21 +02:00
scrawl
3961c276b8 Added enemy health meter 2013-07-30 06:00:20 +02:00
Marc Zinnschlag
e27ba55541 Merge remote-tracking branch 'swick/countdialog' 2013-07-29 21:38:04 +02:00
Sebastian Wick
40d3efc671 use cancel methid 2013-07-29 18:35:23 +02:00
Sebastian Wick
7b40e57ba1 Allow the 'Activate' key to close the countdialog window; cleanups 2013-07-29 18:27:00 +02:00
Marc Zinnschlag
90ab7b2bf5 Merge remote-tracking branch 'swick/viewmodetransission' 2013-07-29 17:08:49 +02:00
Sebastian Wick
7c24c0a64e fix uninitialized variables 2013-07-29 16:45:35 +02:00
Sebastian Wick
d2b7cb5bb2 First/Third person transitions with mouse wheel 2013-07-29 16:43:16 +02:00
Marc Zinnschlag
34c825ce52 added icons and type listing to UniversalId class 2013-07-29 16:21:42 +02:00
Marc Zinnschlag
661b290c49 automatically scroll table to the position of a newly created record 2013-07-29 15:00:41 +02:00
Sebastian Wick
1b310c5c5b use SDL resolutions in the ingame settings 2013-07-29 13:34:56 +02:00
Marc Zinnschlag
3fa4a194a7 Merge remote-tracking branch 'scrawl/master' 2013-07-29 09:59:23 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
Chris Robinson
3744850545 Fix hand-to-hand health damage reduction 2013-07-28 16:07:09 -07:00
Chris Robinson
39507e3f0f Decrease armor condition on successful hits 2013-07-28 15:51:17 -07:00
Chris Robinson
1af48ab6e0 Decrease weapon condition on successful hits 2013-07-28 15:17:01 -07:00
Chris Robinson
465f4d2063 Properly handle starting an animation at the end 2013-07-28 09:56:03 -07:00
Marc Zinnschlag
82958e6514 added custom creator for cell records 2013-07-28 18:08:57 +02:00
Chris Robinson
54f91d4b3a Implement hand-to-hand attacks 2013-07-28 06:48:25 -07:00
Marc Zinnschlag
899e18b2cf report ID errors also via input field tool tips 2013-07-28 15:28:35 +02:00
Marc Zinnschlag
5ec9d370cb check if ID is already in use when creating new IDs 2013-07-28 15:27:15 +02:00
Marc Zinnschlag
124a70906f added creator edit lock 2013-07-28 14:51:47 +02:00
Marc Zinnschlag
32c697abc6 validate IDs entered by the user 2013-07-28 14:40:11 +02:00
Marc Zinnschlag
4f6e99c391 more compact layout for the bottom box 2013-07-28 14:00:26 +02:00
Marc Zinnschlag
00fcb79f08 moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one) 2013-07-28 13:43:16 +02:00
Marc Zinnschlag
2d46a1db2f changed CreateCommand to work directly on the model instead of the proxy 2013-07-28 13:39:33 +02:00
Chris Robinson
a34f0de3e1 Play the correct medium armor foot sounds 2013-07-28 04:17:36 -07:00
Chris Robinson
db4f34b332 Play hit sounds when hitting creatures and NPCs 2013-07-27 11:20:39 -07:00
Chris Robinson
1a40d01afa Fix NPC armor rating calculation and reduce redundant lookups 2013-07-27 09:31:16 -07:00
Chris Robinson
f73008546f Keep a sound updated with its object's position 2013-07-27 07:24:18 -07:00
Chris Robinson
c94653dc49 Implement the ModRegion script function 2013-07-27 07:10:18 -07:00
Marc Zinnschlag
f93af52486 handling down a reference to Data and the undo stack to the creators 2013-07-27 13:28:12 +02:00
Chris Robinson
1174b85ac8 Implement Disable/EnableTeleporting script functions 2013-07-27 00:14:55 -07:00
Marc Zinnschlag
fee748d4b5 added creator bar UI and cancel button 2013-07-26 21:09:23 +02:00
Chris Robinson
3298eb1b37 Implement HitOnMe script function 2013-07-26 10:50:23 -07:00
Chris Robinson
5379e607cb Handle the OnPCHitMe script variable 2013-07-26 10:50:23 -07:00
Chris Robinson
f215d2cc30 Only raise weapon skills for the player 2013-07-26 10:50:23 -07:00
Chris Robinson
bec420c69b Add Class::onHit for creatures 2013-07-26 10:50:23 -07:00
Chris Robinson
dd6edd21f8 Add a separate on-hit method to handle objects being hit 2013-07-26 10:50:23 -07:00
Marc Zinnschlag
b8ac45defe added creator to bottom box layout and re-routed add record event to bottom box 2013-07-26 18:22:31 +02:00
Marc Zinnschlag
d899cbb449 removed some junk 2013-07-26 18:14:34 +02:00
Marc Zinnschlag
ed83e2e70a added creator to bottom box; more cleanup 2013-07-26 12:51:45 +02:00
Marc Zinnschlag
6c4bdc0101 minor cleanup; less pointer usage 2013-07-26 12:42:15 +02:00
Marc Zinnschlag
ba5ca5beed replaced createAndDelete flag with a new class hierarhy (Creator) 2013-07-26 12:35:17 +02:00
Emanuel Guevel
aa14656ff2 esmtool: fix swapped comparison operators 2013-07-26 10:24:15 +02:00
Marc Zinnschlag
3fbbbdc64b Merge remote-tracking branch 'scrawl/master' 2013-07-26 08:06:53 +02:00
Chris Robinson
a569ae367e Fix hit chance calculation 2013-07-25 13:09:26 -07:00
Chris Robinson
6195062d72 Try to figure out what gets hit 
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
 2013-07-25 12:58:43 -07:00
Chris Robinson
b3a057d679 Handle hit chance and damage calculation 
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
 2013-07-25 08:15:42 -07:00
Marc Zinnschlag
4327b81bc3 fixed column handling in table (had problems with filtered out columns before) 2013-07-25 14:38:53 +02:00
Marc Zinnschlag
55e7e71c11 added optional per-subview status bar 2013-07-25 14:29:56 +02:00
Chris Robinson
1dcc893703 Merge remote-tracking branch 'zini/master' into combat 2013-07-25 01:16:49 -07:00
Chris Robinson
4ad28ed369 Don't play a weapon-down sound when unreadying a spell 2013-07-25 00:46:20 -07:00
Chris Robinson
92cc566fdc Rename the Class::attack method to Class::hit 2013-07-25 00:30:01 -07:00
Chris Robinson
0db02af807 Set up the weapon state in the CharacterController constructor 2013-07-24 21:08:16 -07:00
Chris Robinson
d9a9c3d6bd Handle the "land" soundgen type 2013-07-24 10:36:04 -07:00
Chris Robinson
705498ec24 Play a swish sound when attacking 2013-07-24 10:34:53 -07:00
Chris Robinson
d8ec813939 Say something from the "hit" dialog topic when losing health 2013-07-24 10:02:50 -07:00
Chris Robinson
59f1bc7542 Use time values for the aniamtion's start, stop, and loop points 
This seems to be closer to the expected behavior. This more cleanly handles 0-
length animations, especially where the start marker comes after the stop
marker while still being on the same time key.
 2013-07-24 08:38:36 -07:00
Chris Robinson
bf1d907d07 Don't play casting animations for enchantments 2013-07-24 05:39:15 -07:00
Chris Robinson
cc8e8c1272 Use the attack strength as determined by how long the attack was held 2013-07-24 03:18:53 -07:00
Chris Robinson
0c8d4d9be2 Add beginnings of melee hits 2013-07-24 02:51:42 -07:00
Chris Robinson
45302f9e25 Handle controllers in the NPC's bound object parts 2013-07-23 22:05:03 -07:00
Marc Zinnschlag
a80e80dd94 added layout to table sub view 2013-07-23 21:59:02 +02:00
Chris Robinson
11b094559f Play the appropriate casting animation sound 2013-07-23 11:12:19 -07:00
Emanuel Guevel
70a5a83419 Change the formula used to calculate initial NPC health 2013-07-23 16:48:54 +02:00
Chris Robinson
17282c69b1 Handle spell-casting animation sequences 2013-07-23 07:30:54 -07:00
Chris Robinson
4d157cb19a Handle marksmen weapon attack sequences 2013-07-23 06:13:08 -07:00
Chris Robinson
fecb8c1cc4 Fix the completion amount for 0-length anims 2013-07-23 05:30:37 -07:00
Chris Robinson
d5d832846e Rename the follow-up upper character state enum 2013-07-23 04:56:49 -07:00
Chris Robinson
537d5c4934 Avoid trying to play animations without any animation sources 2013-07-23 04:36:25 -07:00
Chris Robinson
ad6d663e09 Remove some unnecessary debug messages 2013-07-23 03:44:52 -07:00
Chris Robinson
24567294ff Move NPC state update handling into a separate method 2013-07-23 03:26:24 -07:00
Chris Robinson
22e07968af Store the current weapon group name 2013-07-23 02:50:52 -07:00
Chris Robinson
0240efa6cf Improve weapon attack logic to better handle picks, probes, and h2h 2013-07-23 02:28:58 -07:00
Chris Robinson
ef17fdeb15 Remove some unused methods 2013-07-23 01:37:41 -07:00
Marc Zinnschlag
ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2' 
Conflicts:
	apps/openmw/mwrender/animation.cpp
 2013-07-23 09:12:23 +02:00
Marc Zinnschlag
7600d6c04b basic filter table 2013-07-22 21:18:47 +02:00
Marc Zinnschlag
66534a45da replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality 2013-07-21 17:53:39 +02:00
Emanuel Guevel
48f0e64ec3 Fix health calculation at character creation 2013-07-21 11:02:03 +02:00
Emanuel Guevel
1c330fc899 Use the correct formula for NPC health initialization 2013-07-21 10:13:46 +02:00
Emanuel Guevel
2356e6218e Complete health increase on level up 2013-07-20 22:14:10 +02:00
Emanuel Guevel
2a0644a7c3 Move some levelup logic from mwgui to mwmechanics 2013-07-20 22:14:10 +02:00
Emanuel Guevel
7837dcdc19 Calculate NPC health on loading instead of updating it continually 
Only NPC with auto-calculated stats are concerned.
 2013-07-20 22:14:10 +02:00
Emanuel Guevel
074e241c32 MWMechanics::DynamicStat: fix members initialization 2013-07-20 22:14:09 +02:00
Marc Zinnschlag
a8168c58c2 Merge remote-tracking branch 'kolek/thirdpersonzoom' 2013-07-20 18:29:59 +02:00
Kolzi
d12bac2d9e Third person zoom - fixed code review issues. 2013-07-20 16:55:35 +02:00
Marc Zinnschlag
0fad2e7f40 restructured main menu 2013-07-20 13:46:56 +02:00
Marc Zinnschlag
2497c18702 replaced settings change notifications for columns with a more robust implementation 2013-07-20 13:19:27 +02:00
Kolzi
1b7966ca27 Can zoom in and out in third person view. 2013-07-19 16:12:01 +02:00
Chris Robinson
0cb7d186e7 Use Play_TypeFoot for 'left' and 'right' soundgen keys 2013-07-18 21:50:11 -07:00
Chris Robinson
14e0c182f3 Allow specifying the sound type to playSound and playSound3D 2013-07-18 21:50:11 -07:00
Chris Robinson
ac4dfd3b39 Play the appropriate foot sound based on footwear 2013-07-18 21:50:11 -07:00
scrawl
bf332b633e Make VideoPlayer::playVideo block until the video finishes 2013-07-18 14:14:10 +02:00
Marc Zinnschlag
365ea11e86 Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 2013-07-18 13:51:24 +02:00
Marc Zinnschlag
fdd47e5b73 silenced a warning 2013-07-18 13:50:12 +02:00
graffy76
0ae254f6a8 Fixed segfault opening tables 2013-07-18 06:31:47 -05:00
Chris Robinson
9c13568bb7 Remove idles from the state list and rename it 2013-07-18 01:49:53 -07:00
Chris Robinson
e803cdbe7f Handle swimdeath and missing death animations 2013-07-18 01:13:53 -07:00
Chris Robinson
f01b0b48cc Don't start with an idle state if dead 2013-07-18 00:35:03 -07:00
Chris Robinson
e78bdd2a5d Clear 'swim' from the animation name as a backup instead of 'sneak' 2013-07-18 00:22:40 -07:00
Chris Robinson
9ea6b22a83 Handle soundgen animation keys 2013-07-17 23:58:21 -07:00
Chris Robinson
d6324d71bf Ensure mechanics actors/objects are cleared before adding them 2013-07-17 21:39:21 -07:00
Chris Robinson
c7692acb79 Update the player's Ptr in mwrender when changing cells 2013-07-17 19:11:03 -07:00
graffy76
6486f342b5 Fixed setting synchronization issue 
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
 2013-07-17 20:19:01 -05:00
Marc Zinnschlag
1b4cd787a5 Merge remote-tracking branch 'kcat/animation-state' 2013-07-17 11:33:04 +02:00
Chris Robinson
0cd4df3edf Stop playing idles on death 2013-07-17 02:19:22 -07:00
Chris Robinson
e2e278d06d Fix some animations not playing properly 
Default movement animation speed multiplier should be 1, not 0. Only
randomize death1...death5 for NPCs.
 2013-07-17 02:06:31 -07:00
scrawl
dfe912dcab Enum renaming 2013-07-16 23:38:55 +02:00
scrawl
91e95e1404 Use the correct slash, chop or thrust animation 2013-07-16 23:32:41 +02:00
gugus
9043fe427f Merge pull request #4 from scrawl/melee 
Fixes weapon input to use A_Use instead of hardcoding to mouse button
 2013-07-16 07:35:21 -07:00
scrawl
9536b5050b Fixes weapon input to use A_Use instead of hardcoding to mouse button 2013-07-16 16:25:41 +02:00
gus
66e3eacace fix bows 2013-07-16 15:14:34 +01:00
gus
701ff94887 bugfix for lockpick 2013-07-16 14:46:44 +01:00
gus
20341ae8b7 simplification + taking into account weapon speed. Seems too fast, but i'm not sure 2013-07-16 14:10:14 +01:00
gus
8fc6e73649 post-merge fix 2013-07-16 11:51:18 +01:00
gus
ee47e99dad Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
	apps/openmw/mwmechanics/character.hpp
 2013-07-16 11:40:19 +01:00
Marc Zinnschlag
47f7bbd48a fixed OpenCS crash during cell loading when loading multiple ESX files 2013-07-16 12:08:35 +02:00
gus
f6e3445414 Jittering gone + bugfix: chop animation works! 
TODO: fix this unequip stuff
 2013-07-16 09:50:59 +01:00
Chris Robinson
e5e9c83ed5 Merge remote-tracking branch 'zini/master' into animation-state 2013-07-16 01:33:46 -07:00
Chris Robinson
a932a89e02 Specify the velocity-based animation speed multiplier when playing it 2013-07-16 01:30:03 -07:00
Chris Robinson
f296d13c20 Add a speed multiplier to the animation state 2013-07-16 00:43:31 -07:00
Chris Robinson
3a1facefdf Store a pointer to the character controller for non-actor objects 2013-07-15 23:47:04 -07:00
Chris Robinson
06e631f213 Track death separately in the character controller 2013-07-15 23:43:33 -07:00
Chris Robinson
4ae65c20e6 Separate movement and idle states 
This allows us to better handle cases of "missing" animations. Mainly for
first-person, but also for spells and certain weapon types.
 2013-07-15 22:56:23 -07:00
scrawl
94d45e1518 Fix twohanded weapons not unequipping when equipping a torch 2013-07-15 23:21:01 +02:00
scrawl
daf9dca121 Fix exception when starting a new game 2013-07-15 20:37:36 +02:00
gus
f7f23ac5d8 improvement of the chop animation. Still some jittering. 2013-07-15 17:18:16 +01:00
gus
f7b711aabe bugfix 2013-07-15 16:37:32 +01:00
gus
076f98cbba change way animations keys are handled (thanks KittyCat!) 2013-07-15 16:37:25 +01:00
Marc Zinnschlag
fd9cc1c282 Merge remote-tracking branch 'vorenon/container' 2013-07-15 09:33:16 +02:00
Marc Zinnschlag
a0022e711b Merge remote-tracking branch 'scrawl/raycast' 2013-07-15 09:20:16 +02:00
vorenon
66eb82b363 oops again 2013-07-15 02:26:22 +02:00
vorenon
33779ae23c oops 2013-07-15 02:23:18 +02:00
vorenon
d4739a451a added ability to close container windows with the activation key 2013-07-15 02:18:24 +02:00
scrawl
c81b852071 Fixes inaccurate ray casts; rely on getCameraToViewportRay 2013-07-15 00:39:37 +02:00
scrawl
8407e2b3aa Fixes the console sometimes receiving text after it was closed 2013-07-14 23:54:28 +02:00
Marc Zinnschlag
1bc343f363 Merge remote-tracking branch 'kcat/first-person' 2013-07-14 21:28:09 +02:00
scrawl
fa5198d7b2 Fix an assertion 2013-07-14 14:59:24 +02:00
scrawl
61661c8653 Fix first person meshes casting shadows 2013-07-14 14:55:07 +02:00
scrawl
a049638e7f Fixes character previews getting shadowed randomly 2013-07-14 14:54:40 +02:00
Marc Zinnschlag
6a5ab34971 Merge branch 'region' 2013-07-14 12:19:02 +02:00
Chris Robinson
3771e5839e Allow some more third person fallbacks in first person 2013-07-13 17:03:10 -07:00
Chris Robinson
5ee889e8b6 Attach the camera to the Head node in first-person 2013-07-13 16:12:38 -07:00
gus
3947f44aa3 Porting old work 2013-07-13 22:24:52 +01:00
Chris Robinson
2d7620e774 Rotate the neck when looking up and down in first-person 2013-07-13 12:39:06 -07:00
Marc Zinnschlag
4cce466dc7 inverted region map y-axis 2013-07-13 16:34:10 +02:00
Chris Robinson
4df1f198a7 Avoid a map lookup for every skin body part when updating 2013-07-12 22:32:09 -07:00
Chris Robinson
6de56615aa Avoid casting shadows in first-person view 2013-07-12 22:32:05 -07:00
Chris Robinson
025fa4e0d5 Use a multimap for the bodypart map 2013-07-12 22:32:04 -07:00
Chris Robinson
a5e4faaed2 Show arms and body parts in first person 
This isn't yet fully correct. The arms need to rotate up and down with
the camera, and the mesh's bounding box is causing them to blink out at
certain angles since they don't fit the animation.
 2013-07-12 22:31:59 -07:00
Chris Robinson
908f010c74 Reset the NPC object root when switching POV 
When in first person, the skeleton in the .1st.nif file is used. In
particular, these have extra finger bones that are used by the first
person models.
 2013-07-12 22:31:57 -07:00
Chris Robinson
7883087586 Store a pointer to the character controller in the map 2013-07-12 22:31:50 -07:00
Marc Zinnschlag
c26a6f884f added region map tooltips 2013-07-12 12:55:14 +02:00
greye
29b7734b52 add qualifiers for names in templates to make gcc 4.7+ happy 2013-07-12 08:33:02 +04:00
Marc Zinnschlag
c808bf2b23 updating region map on changes to region and cell records 2013-07-11 15:05:28 +02:00
Marc Zinnschlag
b17f383c6d Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2013-07-11 09:09:52 +02:00
graffy76
11178cc470 Repo permissions commit fix #3 2013-07-10 21:44:25 -05:00
graffy76
bb049806df Repo permissions commit fix #2 2013-07-10 21:13:59 -05:00
graffy76
ae4e3181d9 Fixing repo permissions commit #1 2013-07-10 17:29:07 -05:00
scrawl
bbb5d2b98a Change tooltip positioning to resemble vanilla 2013-07-10 03:40:13 +02:00
Marc Zinnschlag
d389b70ec4 added missing case folding 2013-07-09 14:22:58 +02:00
Marc Zinnschlag
121978a69e some cleanup; added handling of deleted cells (now displayed instead of ignored) 2013-07-09 14:20:28 +02:00
Marc Zinnschlag
116320cc0d dealing with invalid regions and cells without regions 2013-07-08 17:13:58 +02:00
Marc Zinnschlag
6159724b04 build region map from records (only initial build; updates not implemented yet) 2013-07-08 16:53:08 +02:00
Marc Zinnschlag
4f05f2bddf basic region map; non-interactive for now and working with dummy data instead of real cell/region records 2013-07-08 13:12:50 +02:00
Marc Zinnschlag
71a6955182 Merge remote-tracking branch 'scrawl/master' 2013-07-08 09:46:00 +02:00
scrawl
91f6d87126 Fix an uninitialized variable 2013-07-07 16:57:46 +02:00
Marc Zinnschlag
602e40e19d Merge remote-tracking branch 'greye/coc' 2013-07-07 13:34:28 +02:00
greye
e553f285b8 update player position on engine start 2013-07-07 15:06:05 +04: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
greye
6bb3942288 use Land height data for position in coc 2013-07-07 13:47:58 +04:00
greye
a3094b808e update coc behaviour for interior cells 2013-07-07 13:47:58 +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
Marc Zinnschlag
de5898c953 post merge fixes 2013-07-06 18:34:14 +02:00
Marc Zinnschlag
4986b7d65d Merge branch 'master' into ref 2013-07-06 17:54:19 +02:00
Marc Zinnschlag
1c4b70805b added missing reference table columns 2013-07-06 17:41:06 +02:00
Marc Zinnschlag
9a39f32c32 store ID of cell in reference struct 2013-07-06 17:06:06 +02:00
Marc Zinnschlag
9a49125281 added references table 2013-07-06 17:03:18 +02:00
scrawl
72600a16cf Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea 2013-07-06 17:02:40 +02:00
scrawl
58fce74620 Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders 2013-07-06 16:40:57 +02:00
scrawl
5c8950f91c Merge branch 'master' of git://github.com/zinnschlag/openmw 2013-07-06 16:08:29 +02:00
Marc Zinnschlag
f9d7c7574e Merge remote-tracking branch 'swick/scrollbar' 2013-07-06 13:13:27 +02:00
Marc Zinnschlag
3dc42fb948 Merge remote-tracking branch 'greye/master' 2013-07-06 12:28:01 +02:00
greye
76d95dffb6 special case for loading StartScript records 2013-07-05 23:52:46 +04:00
Sebastian Wick
26bd2a5301 use the new scrollbar; range dependent step size; fix 2013-07-05 20:28:46 +02:00
Sebastian Wick
b43f41c2bd use a mygui controller for scrollbar repeat 2013-07-05 19:17:00 +02:00
Sebastian Wick
e3d8bdbafe autorepeat scrollbar 2013-07-02 17:29:47 +02:00
graffy76
9f6d250463 QDebug reference removal 2013-07-01 07:40:47 -05:00
Marc Zinnschlag
847ec9fa56 Merge remote-tracking branch 'swick/master' 2013-07-01 10:16:39 +02:00
Sebastian Wick
8bdc9ff3ae set position of the window for multiple monitors 2013-07-01 03:56:33 +02:00
graffy76
55b115935a Implemented RefRecordTypeDelegate 
Added accessor functions to CSMWorld::UniversalId for static const
sIdArg[]
 2013-06-30 07:43:58 -05:00
graffy76
9d95a38934 Implementing delegate for referenceables table Type column 
Added delegate skeleton class

Added delegate creation code in ViewManager

Added Display_RefRecordType enum to columnbase.hpp

Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp

modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
 2013-06-29 08:54:32 -05: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
scrawl
123a60581f Only link to SDL2main on windows 2013-06-27 21:45:32 +02:00
Marc Zinnschlag
e88040662e Merge remote-tracking branch 'glorf/master' 2013-06-27 12:24:09 +02:00
Marc Zinnschlag
afb120d5ce Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-27 08:11:27 +02:00
graffy76
6deddf7229 Fixed code conventions in user settings, changed top-level page names 2013-06-26 21:18:21 -05:00
Glorf
88f8637145 Bugfix #795 2013-06-26 22:20:24 +02:00
Glorf
5b81d124bb Catched another exception 2013-06-26 18:43:27 +02:00
Glorf
f4d302501e Bugfix #826 2013-06-26 18:29:09 +02:00
Marc Zinnschlag
623200b50e Merge remote-tracking branch 'pakanek/libav_headers' 2013-06-26 10:58:43 +02:00
Marc Zinnschlag
8ffea60b72 some cleanup 2013-06-26 10:09:26 +02:00
Marc Zinnschlag
12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-26 09:48:51 +02:00
Miroslav Puda
743b3dec99 Correction of libavutil version 2013-06-26 07:17:29 +02:00
graffy76
f0f895ad10 Fixed settings file error message 
Errors only occur if both global and local settings files are not found.
All other file read errors fail silently.
 2013-06-25 19:32:36 -05:00
Alexander "Ace" Olofsson
0a2ed8b0d7 Make OpenMW able to initialize SDL in windows builds 2013-06-25 15:05:10 +02:00
eroen
d75391de8e libav-9 - fix missing includes 
With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the
AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h
for a long time prior to this.
 2013-06-24 21:08:28 +02:00
Marc Zinnschlag
05649a1654 Merge remote-tracking branch 'swick/master' 2013-06-24 14:35:32 +02:00
Vincent Heuken
09cca0bf80 more detailed error message when SDL fails to initialize 2013-06-23 16:45:23 -07:00
Marc Zinnschlag
99508a6eaa minor cleanup 2013-06-23 22:52:02 +02:00
Sebastian Wick
20e591fe18 use index instead of string manipulation 2013-06-23 21:56:27 +02:00
Sebastian Wick
357974a429 more minor stuff 2013-06-23 21:34:41 +02:00
mckibbenta
1f4d1d3b57 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-06-23 15:29:35 -04:00
mckibbenta
5803726233 modified gmst addition during creation of new base file 2013-06-23 15:19:08 -04:00
Sebastian Wick
c97fac8116 use QMessageBox to show errors 2013-06-23 21:16:51 +02:00
Sebastian Wick
89dee80dcf simpler remove of duplicates 2013-06-23 21:04:49 +02:00
Sebastian Wick
6abb5d5f75 small fixes 2013-06-23 20:53:50 +02:00
Sebastian Wick
dbfc39468b better workaround 2013-06-23 20:45:24 +02:00
Marc Zinnschlag
0829548106 Merge remote-tracking branch 'swick/multimonitor' 
Conflicts:
	apps/launcher/graphicspage.cpp
 2013-06-23 08:34:35 +02:00
Sebastian Wick
6f7a7b4714 remove old code 2013-06-23 05:02:19 +02:00
Sebastian Wick
bb39a85f16 remove double entries 2013-06-23 04:43:34 +02:00
Sebastian Wick
14d074e3e7 select first screen if none is in the setting 2013-06-23 04:21:32 +02:00
Sebastian Wick
a1fea97c3b use SDL for resolution -> multimonitor support 2013-06-23 03:49:30 +02:00
mckibbenta
16a27e28f7 inluded gmsts with default values to creation of new base files 2013-06-22 21:01:27 -04:00
Marc Zinnschlag
d61c12ccfc minor cleanup 2013-06-22 20:32:11 +02:00
Sebastian Wick
d364fd8561 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-06-22 19:17:39 +02:00
Sebastian Wick
0e29286856 fix custom resolution maximum 2013-06-22 19:15:13 +02:00
graffy76
62e164b2aa Fixed load file error if no file is found 2013-06-22 07:43:28 -05:00
graffy76
a73b97d125 Fixed broken references and other bugs 
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
 2013-06-21 23:23:43 -05: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
graffy76
b3d185e421 Unsaved changes missed in previous commits 2013-06-20 18:08:53 -05:00
graffy76
f4a2cf64c2 Removed CSVSettings::SamplePage class files 2013-06-20 18:07:34 -05:00
graffy76
101c147217 Final changes for record status icon feature, incl. window size user 
preference

1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
 2013-06-20 18:06:25 -05: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
vorenon
4e8e048968 Added missing click sounds to dialogue 2013-06-19 01:46:38 +02:00
Marc Zinnschlag
94ec05c2c6 Revert "simplifying CSMWorld::CellRef" 
With the refactored collection class we can now handle the more complex load function

This reverts commit 97f421df8a.
 2013-06-18 11:27:05 +02:00
Marc Zinnschlag
9c6fa29938 Merge remote-tracking branch 'glorf/bugfix2' 2013-06-17 23:33:09 +02:00
Glorf
09cc57381a Bugfix #809 2013-06-18 00:43:31 +02:00
Thoronador
d26e721d10 no const for int and bool 2013-06-17 18:47:12 +02:00
Thoronador
9313b2b3fe better const correctness for MwIniImporter 2013-06-17 17:44:40 +02:00
Marc Zinnschlag
f0718c477f Merge remote-tracking branch 'darkf/issue-812' 2013-06-17 15:02:18 +02:00
Marc Zinnschlag
5b3d2f5da1 gave Collection class its own header file and removed an unsed cpp file 2013-06-17 14:28:09 +02:00
Marc Zinnschlag
8f167a603c split IdCollection into Collection and IdCollection class 2013-06-17 14:16:26 +02:00
Marc Zinnschlag
4b2d920f9d rewrote IdCollection::load (not using private members of IdCollection anymore) 2013-06-17 13:49:32 +02:00
graffy76
f87eb67968 Fixed conflicts 
Merge branch 'cs-windows' of https://github.com/Glorf/openmw

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/model/settings/usersettings.hpp
	apps/opencs/view/settings/usersettingsdialog.cpp
 2013-06-17 06:45:44 -05:00
Marc Zinnschlag
2968b96882 added a bit more documentation 2013-06-17 13:03:32 +02:00
Marc Zinnschlag
f4e7916ec4 moved IdCollection base into its own source file pair and renamed it to Collection 2013-06-17 11:42:02 +02:00
darkf
43455129d0 launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed. 2013-06-17 08:58:48 +00:00
Marc Zinnschlag
b5926257f5 Merge remote-tracking branch 'scrawl/sdl_input2' 2013-06-16 21:23:35 +02:00
scrawl
b16bc69479 Removed the no longer needed --debug switch 2013-06-16 20:39:40 +02:00
Marc Zinnschlag
57ce87bf12 Merge remote-tracking branch 'scrawl/sdl_input2' 2013-06-16 20:37:15 +02:00