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

3993 commits

Author SHA1 Message Date
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
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
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
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
Glorf
369cf0b4ca Enchanting price mechanics 2013-04-02 20:46:48 +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
Glorf
900c2cfa81 Minor bugfix #646 change 2013-04-02 14:08:59 +02:00
Marc Zinnschlag
f9f520df34 adjusted faction record to increase consistency with other records 2013-04-02 13:59: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
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
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
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
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
78f3f19f62 Thrown weapons, arrows and bolts shouldn't have item health 2013-03-22 14:28:50 +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
cd84b68e4b silencing some warnings 2013-03-20 20:55:48 +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
Emanuel Guevel
8de93db488 Coding style consistence 2013-03-20 20:10:55 +01:00
Emanuel Guevel
f25b56ac88 Add dialogue function: NotLocal 2013-03-20 20:10:54 +01:00
Emanuel Guevel
ad3478c8f2 Fix inverted dialogue functions (NotClass etc.) 
The comparison present is useless for these functions.
 2013-03-20 20:10:54 +01:00
scrawl
4cbb202306 Several tooltip fixes 2013-03-20 03:31:01 +01:00
scrawl
b9c3a4816d Fix dialogue topics still being accessible in the history pane when they shouldn't be 2013-03-20 03:30:15 +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
3bd545ed8e In-console nonexistent class fix 2013-03-19 21:55:37 +01:00
Glorf
dd11ae04ee Console code cleaned 2013-03-19 17:25:41 +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
e4ed5b836e added ondeath script function 2013-03-18 11:04:47 +01:00
Marc Zinnschlag
fd2c07a6f4 delete death events on adding an actor to the scene 2013-03-18 10:54:47 +01:00
Marc Zinnschlag
61cb0f98a6 keep track of death events 2013-03-18 10:47:09 +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
scrawl
c66675b599 Fix the 'Take all' button taking equipped items when stealing 2013-03-17 22:28:28 +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
6165cd2c6b Moons fallbacks partially implemented 2013-03-17 14:22:30 +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
c07b3ea61d Text defines for npc race, class, and faction should use the translated name 2013-03-17 04:20:30 +01:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
scrawl
1666bc7740 Armor rating 2013-03-16 22:53:33 +01:00
scrawl
e8b08326dc Corrected Id, Race, Class, Faction and Cell select functions to do the exact opposite as before. That is how they are displayed in the CS, anyway. 2013-03-16 20:52:05 +01:00
scrawl
cebcbe11f8 Implemented service refusal 2013-03-16 20:32:21 +01:00
scrawl
c0b0227e8a enchanting 2013-03-16 19:00:14 +01:00
scrawl
485b6c855a Fix NPC race height not being applied 2013-03-15 16:44:35 +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
Marc Zinnschlag
4de2a741ed Merge remote-tracking branch 'scrawl/master' 2013-03-15 09:58:24 +01:00
scrawl
3e9cd0e2e3 Fix the back button on generate class result dialog advancing creation stage 2013-03-14 22:33:51 +01:00
Marc Zinnschlag
ef72894b81 Merge remote-tracking branch 'scrawl/alwaysrun' into next 2013-03-14 22:11:12 +01:00
scrawl
7ab236337b Dialogue responses should be random only for persuasion results 2013-03-14 21:33:00 +01:00
scrawl
b36295cbb3 Removed a leftover 2013-03-14 21:10:22 +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
scrawl
beab20cb42 Fix message boxes not opening if they opened as a result of object activation 2013-03-14 19:53:57 +01:00
gus
9efb073617 clean up + correct a bug 2013-03-14 18:05:00 +00:00
gus
80804fac35 check if the NPC is close from a non loaded cell. If yes, AITravel is simply ended. 2013-03-14 17:16:37 +00:00