Marc Zinnschlag
a91e3c0b01
Merge remote-tracking branch 'scrawl/fatigue_bug'
2013-04-07 19:50:16 +02:00
Marc Zinnschlag
5dc1a00544
Merge remote-tracking branch 'scrawl/master'
2013-04-07 19:43:39 +02:00
Marc Zinnschlag
593646436e
added verifier for region record
2013-04-07 19:39:13 +02:00
Marc Zinnschlag
c9424f577f
added sleeplist column to region table
2013-04-07 19:29:15 +02:00
Tom Mason
822866b5ae
fixed autorun
2013-04-07 18:04:30 +01:00
Marc Zinnschlag
f49a2a97c5
added map colour column to region table
2013-04-07 16:56:21 +02:00
Marc Zinnschlag
e25f5c6dfe
added basic region table
2013-04-07 16:32:06 +02:00
scrawl
8bbfba3f43
Fix fatigue not being set to its maximum value when player is rebuilt
2013-04-07 16:18:40 +02:00
scrawl
755a80a522
Fix camera shaking when near the pitch limit.
2013-04-07 15:52:43 +02:00
Marc Zinnschlag
ff1d908af4
added script table
2013-04-07 15:17:35 +02:00
Chris Robinson
be419bc891
Handle NiCamera nodes
2013-04-07 02:28:15 -07:00
Chris Robinson
878b4c15c5
Set visibility flags and the render queue group for particles
2013-04-07 02:08:33 -07:00
Chris Robinson
2db72ae607
Rename EntityList to ObjectList
2013-04-07 01:52:35 -07:00
Marc Zinnschlag
e2c6458adb
added verifier for sound records
2013-04-06 21:48:52 +02:00
Marc Zinnschlag
50b58b2ead
added sound file column to sound table
2013-04-06 21:43:05 +02:00
Marc Zinnschlag
dd5940b395
added sound parameter columns to sonud table
2013-04-06 21:40:03 +02:00
Marc Zinnschlag
8bf569d58a
added basic sound table
2013-04-06 21:21:10 +02:00
Chris Robinson
41e410347e
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-06 10:35:01 -07:00
Marc Zinnschlag
053f744566
Merge remote-tracking branch 'scrawl/master'
2013-04-06 19:31:46 +02:00
scrawl
1f3df4df0f
Perform a sanity check on count arguments
2013-04-06 19:25:29 +02:00
Marc Zinnschlag
0f34c79d0a
Merge branch 'race'
2013-04-06 19:21:38 +02:00
Marc Zinnschlag
98e7b3fd93
check for at least one playable race
2013-04-06 19:20:59 +02:00
Marc Zinnschlag
9bc3945f40
multiple fixes to UniversalId constructor
2013-04-06 19:20:46 +02:00
Chris Robinson
59f1d4b047
Add support for NiUVController on meshes
2013-04-06 09:44:10 -07:00
Marc Zinnschlag
0fb583e065
added verifier for race record
2013-04-06 17:35:36 +02:00
Chris Robinson
1d934e3112
Reduce some stdout spam
2013-04-06 04:46:28 -07:00
Chris Robinson
0631b28646
Prepare for supporting controller objects
2013-04-05 10:13:54 -07:00
Chris Robinson
af2a38db38
Fix looping anims that dont have "loop start"
2013-04-05 08:27:26 -07:00
Glorf
48d9885554
Started bugfix #691
2013-04-05 15:42:05 +02:00
Marc Zinnschlag
35fe828108
added race table weight/height columns
2013-04-05 13:46:48 +02:00
Marc Zinnschlag
076831c9cc
added flag columns to race table
2013-04-05 12:48:05 +02:00
Chris Robinson
4d14fe0d95
Merge remote-tracking branch 'zini/master' into nifogre
2013-04-04 22:06:27 -07: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
scrawl
48a88f1917
Fix startRandomTitle
2013-04-04 15:10:27 +02:00
Marc Zinnschlag
73da794d77
added basic race table
2013-04-04 14:34:39 +02:00
Chris Robinson
77ba0fbe73
Prepare for creating particles
...
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
2013-04-04 05:10:52 -07:00
Marc Zinnschlag
18e046e628
cleaned up race record struct
2013-04-04 13:50:36 +02:00
Marc Zinnschlag
62d70f17c8
removed another redundant include
2013-04-04 12:42:38 +02:00
Marc Zinnschlag
111ebf84bb
replaced an include with a forward declaration
2013-04-04 12:27:57 +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
Marc Zinnschlag
7136ac0079
added missing attribute columns to faction table
2013-04-04 10:58:53 +02:00
Marc Zinnschlag
b5eaa464ad
added faction record verifier
2013-04-04 10:39:43 +02:00
Marc Zinnschlag
06533b8d71
additional check for using the same attribute twice in a class
2013-04-04 10:31:10 +02:00
Marc Zinnschlag
fea44c05d4
added class record verifier
2013-04-04 10:10:58 +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
scrawl
43cdbd033d
Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips
2013-04-03 21:17:31 +02:00
scrawl
8ca88d1a70
Fix merchant repair menu allowing repair of repair items
2013-04-03 21:17:31 +02:00
Marc Zinnschlag
32d3fe0e35
Merge remote-tracking branch 'glorf/enchanting'
2013-04-03 19:39:18 +02:00
Glorf
08e9bb0236
Another small enchanting fix
2013-04-03 18:25:40 +02:00
Glorf
2179619721
Small enchanting fix
2013-04-03 18:06:11 +02:00
Glorf
ae3e4ecf8b
Finished enchanting
2013-04-03 18:02:30 +02:00
scrawl
f0d49fdbd0
Create separate groups for each data dir / BSA file.
2013-04-03 12:28:57 +02:00
scrawl
aac2ba1d5f
Fix loading screen looking for wallpapers in a fixed group.
2013-04-03 12:24:13 +02:00
scrawl
05a5cb3ae4
Improved responsiveness of the inventory window when resizing.
2013-04-03 00:27:29 +02:00
scrawl
df0ee82a3c
Loose files should have priority over BSA resources. This makes texture replacers work.
2013-04-02 23:45:32 +02:00
Glorf
7b7d3353a6
Exception for enchanting with Azura Star
2013-04-02 22:23:38 +02:00
Marc Zinnschlag
ffb133c862
Merge remote-tracking branch 'lgro/qt_and_boost_join_workaround'
2013-04-02 22:18:32 +02:00
Lukasz Gromanowski
98727d2fb6
Workaround for launcher compilation problems due to bug in Qt MOC compiler.
...
For details please see:
https://forum.openmw.org/viewtopic.php?f=7&t=1451
https://bugreports.qt-project.org/browse/QTBUG-22829
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-04-02 21:32:23 +02:00
Glorf
369cf0b4ca
Enchanting price mechanics
2013-04-02 20:46:48 +02:00
Marc Zinnschlag
676a92e2e0
moved Verify function from World menu to File menu
2013-04-02 15:47:25 +02:00
Marc Zinnschlag
9d009af2a1
simplified code for sub view factory creation
2013-04-02 15:33:28 +02:00
Marc Zinnschlag
0856e3ebc2
Merge remote-tracking branch 'glorf/bugfix'
2013-04-02 14:35:14 +02:00
Marc Zinnschlag
df658d29f0
Merge branch 'faction'
2013-04-02 14:21:51 +02:00
Marc Zinnschlag
82498f6cff
added hidden flag column to faction table
2013-04-02 14:20:51 +02:00
Marc Zinnschlag
384c88182d
dealing with unset attribute fields
2013-04-02 14:15:22 +02:00
Glorf
900c2cfa81
Minor bugfix #646 change
2013-04-02 14:08:59 +02:00
Marc Zinnschlag
ec6bdbeb40
added skill columns to faction table
2013-04-02 14:04:13 +02:00
Marc Zinnschlag
f9f520df34
adjusted faction record to increase consistency with other records
2013-04-02 13:59:45 +02:00
Marc Zinnschlag
c71edb613d
added faction table
2013-04-02 12:00:45 +02:00
Glorf
d25c838e1d
Bugfix #646
2013-04-02 11:42:29 +02:00
gus
6a33170ca2
More bugfix, but I don't like this one.
2013-04-01 17:44:06 +00:00
gus
20af7d89a2
post master-merge fixes. Looks a little odd.
2013-04-01 17:30:40 +00:00
gus
2be9405c96
the sgn function is no longer in the global namespace
2013-04-01 15:44:08 +00:00
Marc Zinnschlag
751c679255
Merge remote-tracking branch 'glorf/enchanting'
2013-04-01 17:35:04 +02:00
Marc Zinnschlag
9dbd024076
another minor fix
2013-04-01 17:30:54 +02:00
Glorf
1bff6ed872
Enchaning values import, fixed constness
2013-04-01 17:12:47 +02:00
gus
1eb3d3e10e
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI
...
Conflicts:
apps/openmw/CMakeLists.txt
2013-04-01 14:10:19 +00:00
gus
47cc945ef4
more refactoring
2013-04-01 12:38:13 +00:00
Marc Zinnschlag
26db983599
minor fix
2013-04-01 10:46:08 +02:00
Chris Robinson
f976eb5bd8
Improve mouselook scaling
2013-03-31 17:32:39 -07:00
Chris Robinson
d0703efd69
Another place to check the class' isActor method
2013-03-31 17:32:39 -07:00
Chris Robinson
04aeb3dd07
Rename Mechanics' Activators to Objects
2013-03-31 17:32:38 -07:00
Chris Robinson
10d04c928c
Use the object's class to check if it's an actor
2013-03-31 17:32:38 -07:00
Glorf
d29a42dcbe
Fixed enchanting mechanics
2013-03-31 23:18:23 +02:00
gus
63424ade56
refactoring
2013-03-31 17:30:03 +00:00
Lukasz Gromanowski
acae815cd2
Added workaround for OpenCS compilation problems due to bug in Qt MOC compiler.
...
For details please see:
https://forum.openmw.org/viewtopic.php?f=7&t=1451
https://bugreports.qt-project.org/browse/QTBUG-22829
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-03-31 18:00:46 +02:00
scrawl
8fd961bbac
Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't.
2013-03-31 15:50:48 +02:00
scrawl
1a2daa3bc1
Merge branch 'master' of git://github.com/zinnschlag/openmw into companion
2013-03-31 14:50:03 +02:00
scrawl
bc6e1fd981
Add missing files
2013-03-31 14:36:03 +02:00
scrawl
b0199c703c
Companion UI
2013-03-31 13:13:46 +02:00
Chris Robinson
4836ba16f7
Implement turning states
2013-03-31 03:50:20 -07:00
Chris Robinson
7611caa6eb
Merge remote-tracking branch 'zini/master' into rotation
2013-03-31 03:00:11 -07: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
b6f2b39a2f
Clear the movement and rotation vector when getting them
2013-03-31 01:56:38 -07:00
Marc Zinnschlag
607435aaf2
Merge branch 'class'
2013-03-31 10:49:56 +02:00
lazydev
38d19d33d8
fix for #634
2013-03-31 10:45:42 +02:00
Chris Robinson
7b02ec411b
Apply the rotation when updating the character controller
2013-03-31 01:29:24 -07:00
Marc Zinnschlag
e71181810f
Merge remote-tracking branch 'scrawl/master'
2013-03-31 10:18:13 +02:00
scrawl
13be61812a
Made the "Unknown class key" exception slightly more helpful
2013-03-31 10:16:02 +02:00
Marc Zinnschlag
48d6fe8014
Merge remote-tracking branch 'kcat/rotation'
2013-03-31 10:14:57 +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
af65ecd841
Pass the movement vector in as a parameter to CharacterController::update
2013-03-30 18:37:40 -07:00
Chris Robinson
63af72c315
Avoid converting to and from quaternions
2013-03-30 17:31:16 -07:00
Chris Robinson
c8606d2f63
Implement IsWerewolf script function
2013-03-30 13:22:33 -07:00
scrawl
e27e53f607
Fix not playable body parts appearing in the race selection menu.
2013-03-30 20:04:05 +01:00
lazydev
ee5d0277e8
fix for #634
2013-03-30 22:18:34 +04:00
Glorf
7dbc779c3a
Self-enchanting mechanics
2013-03-30 19:08:42 +01:00
scrawl
0f0cc0e3e3
Fix a few gold conditions that I missed, trade window was affected
2013-03-30 18:29:21 +01:00
scrawl
a723ad8f29
Don't allow toggling inventory or journal when a modal window is opened
2013-03-30 16:32:24 +01: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
scrawl
04673b2f14
Don't enchant if the enchantment value is too high for the item
2013-03-30 12:54:20 +01:00
scrawl
5e7e9fd26a
Properly calculate light activation range
2013-03-29 20:21: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
Marc Zinnschlag
e7684c4677
some random cleanup
2013-03-29 09:04:02 +01:00
Chris Robinson
c5f0556451
Handle light linear/quadratic settings
2013-03-28 20:57:33 -07:00
Glorf
cc8f7f238e
Enchanted item base ptr fix
2013-03-29 00:55:29 +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
564256c4e1
Fix the spell icon panel being visible when it shouldn't.
2013-03-27 18:04:15 +01:00
scrawl
406488d086
Soulgem value should be multiplied by the trapped soul
2013-03-27 17:39:49 +01:00
scrawl
6f1575d42a
CELL record corrections
2013-03-27 17:27:43 +01:00
scrawl
efe6a3ebee
Fix compile error & warnings
2013-03-26 18:01:01 +01:00
scrawl
2ecd2f4ecd
Merge branch 'next' into HEAD
2013-03-26 17:44:53 +01:00
Marc Zinnschlag
82f1cee116
added is-playable column to class
2013-03-26 09:51:39 +01:00
Marc Zinnschlag
ea3b14f2d2
added skill columns to class
2013-03-26 09:43:13 +01:00
scrawl
6a2b87e14a
Fix dialogue response coloring for creatures
2013-03-25 17:37:59 +01:00
scrawl
4be0c6b708
Fix topics not being selectable for creatures
2013-03-25 17:32:01 +01:00
Marc Zinnschlag
65cda580db
added attributes to class table
2013-03-25 14:31:46 +01:00
Marc Zinnschlag
c7275965b8
added basic class record table
2013-03-25 13:22:06 +01:00
Marc Zinnschlag
f2969e7143
fixed access to records flagged as deleted
2013-03-25 12:56:52 +01:00
Marc Zinnschlag
f39f694638
various global variable fixes in editor
2013-03-25 11:59:25 +01:00
Marc Zinnschlag
6c76e97bbc
fixed day count in rest dialogue
2013-03-25 11:53:02 +01:00
Marc Zinnschlag
1078386fd7
Merge branch 'skills' into next
2013-03-25 11:07:14 +01:00
Marc Zinnschlag
dc67ddf39b
added verifier stage for skill records
2013-03-25 11:07:04 +01:00
Marc Zinnschlag
739e7e7298
improved record access from ID collection
2013-03-25 11:06:40 +01:00
Marc Zinnschlag
7450554ef1
fixed a broken UniversalId constructor
2013-03-25 11:04:41 +01:00
Marc Zinnschlag
10c5f29075
added attribute column to skills
2013-03-24 15:50:29 +01:00
Marc Zinnschlag
114f99ddbf
add skill records when creating a new base file
2013-03-24 15:10:03 +01:00
Marc Zinnschlag
4208d52b1a
added use value columns to skills
2013-03-24 14:51:48 +01:00
Marc Zinnschlag
7cae61a202
Merge remote-tracking branch 'psi29a/master' into next
2013-03-23 18:51:05 +01:00
Bret Curtis
962b504129
add dpkg information for mwiniimporter, this blocked debian/ubuntu buildd from building
2013-03-23 16:20:10 +01:00