teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
6885 commits 34 branches 0 tags 66 MiB
Commit graph

4273 commits

Author SHA1 Message Date
scrawl
757a26794a Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-06 15:35:38 +02:00
scrawl
c6edb0288a Remove unused file 2013-05-06 15:30:23 +02:00
scrawl
1315432322 Handle @# links in journal 2013-05-06 15:14:39 +02:00
scrawl
d43adbaa7c Topic link fixes for russian version, thanks to greye for testing 2013-05-06 13:13:14 +02:00
scrawl
166eac2e25 Cleanup 2013-05-06 11:31:34 +02:00
gus
006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 2013-05-06 00:46:50 +01:00
scrawl
38c399a698 Fix duplicate sounds 2013-05-05 10:51:17 +02:00
scrawl
062ff189a2 Merge branch 'master' into memory 2013-05-04 23:04:33 +02:00
scrawl
0f2866dc15 Text replace fix 2013-05-04 18:49:51 +02:00
scrawl
48c5e33c79 Fix a limitation of the keyword search. It can now highlight keywords that have longer child variations correctly. 2013-05-04 17:40:00 +02:00
scrawl
a33e6b9c35 Fast forward to the last page in the journal when opening it 2013-05-04 16:06:48 +02:00
scrawl
d16bb26a48 Added text colors, goodbye, message 2013-05-04 15:15:44 +02:00
scrawl
f07497bbde Fix lockup 2013-05-04 14:18:13 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
6cd28d1156 Fix a bug in getPCNextRank 2013-05-04 12:28:12 +02:00
scrawl
0bb51fd91d Retrieve the correct case for topics in the journal 2013-05-03 22:53:29 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
gus
7fe7111c19 Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding... 2013-05-03 17:09:09 +01:00
Marc Zinnschlag
2e6594f8f7 Merge remote-tracking branch 'glorf/bugfix-5' 2013-05-03 14:55:00 +02:00
scrawl
75dcf52552 Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made) 2013-05-03 13:55:57 +02:00
Glorf
517dfb4d75 Bugfix #732 part 2 2013-05-03 13:24:34 +02:00
Glorf
57f22c77c0 Bugfix #732 part 1 2013-05-03 12:44:27 +02:00
greye
a8b1706678 init pointer value to prevent segfault 2013-05-03 10:51:42 +04:00
kpp
dcccfd9f22 Initialize values 2013-05-02 22:43:21 +04:00
kpp
28ef4d97da Fixes Bug #734 'Book empty line problem' 
Hides buttons 'Next' and 'Prev' at the last and at the first page
 2013-05-02 07:35:25 +04:00
Chris Robinson
03a6190c5a Merge remote-tracking branch 'zini/master' into animations 2013-05-01 10:20:42 -07:00
Chris Robinson
a120653c38 Implement handling weapon states 2013-05-01 10:19:16 -07:00
Marc Zinnschlag
d5741c7141 Merge remote-tracking branch 'scrawl/master' 2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'" 
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
 2013-05-01 16:56:16 +02:00
scrawl
1acfd849a2 Fix a case folding bug 2013-05-01 16:38:16 +02:00
Marc Zinnschlag
6f0ccb6e38 Merge remote-tracking branch 'scrawl/insertrecords' 2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0 Merge remote-tracking branch 'glorf/acrobatics' 2013-05-01 13:44:23 +02:00
scrawl
40a0969055 Insert records that may not exist in vanilla MW 2013-05-01 12:47:50 +02:00
Glorf
b8630239d7 Code cleanup 2013-05-01 12:25:02 +02:00
Glorf
236ec3409f Finished acrobatics 2013-05-01 12:21:59 +02:00
scrawl
67422c397c GetWindSpeed 2013-05-01 11:42:24 +02:00
scrawl
5063d90dda GetStartingAngle was implemented, but not registered 2013-05-01 11:22:46 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
scrawl
3c68c87923 Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries 2013-05-01 10:28:59 +02:00
scrawl
8bc59f8fe6 Merge branch 'master' into journal 2013-05-01 08:27:42 +02:00
Chris Robinson
d01351431c Merge remote-tracking branch 'zini/master' into animations 2013-04-30 19:27:55 -07:00
Chris Robinson
4b15da076b Move getStateInfo into the character controller 2013-04-30 19:26:41 -07:00
Glorf
d30e43784a Fatigue decrease when jumping, live decrease when falling 2013-04-30 23:39:56 +02:00
Glorf
5a8c1661be Jump acrobatics working, started falling acrobatics implementation 2013-04-30 20:44:17 +02:00
scrawl
1420a2cb33 Tweaked adjustPosition. Now uses a very thin box for tracing the feet only. 2013-04-30 20:43:38 +02:00
scrawl
91c89e5db4 Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace 2013-04-30 20:26:59 +02:00
Glorf
add3cd6456 Advance acrobatics on jump 2013-04-30 18:22:59 +02:00
scrawl
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
Marc Zinnschlag
61e476118d Merge remote-tracking branch 'kcat/animations' 2013-04-30 10:25:26 +02:00
Marc Zinnschlag
2cb7e1f3d5 Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-30 10:24:02 +02:00
scrawl
c0dd383cd0 Fix door collision to work with all possible movement directions 2013-04-30 09:43:32 +02:00
Chris Robinson
05060e57ec Add a weapon state to the character controller 2013-04-29 13:07:49 -07:00
Glorf
d283f8d85f Bugfix #748 2013-04-29 21:19:13 +02:00
Chris Robinson
020e3e8a8e Show the equipped weapon in the inventory screen 
And use the proper pose based on what's equipped.
 2013-04-29 12:08:43 -07:00
Chris Robinson
854de1c6c1 Make sure the weapon is in the proper group 2013-04-29 11:43:37 -07:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
Chris Robinson
063322b081 Declare some variables closer to where they're used 2013-04-29 10:12:50 -07:00
Chris Robinson
0cf531ba12 Make sure to update parts when the weapon changes 2013-04-29 09:53:36 -07:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
Marc Zinnschlag
bab899513a Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-29 18:04:22 +02:00
Glorf
74de8b83b6 Enabled collision when new game 2013-04-29 17:56:16 +02:00
Chris Robinson
a15758ac85 Fix preview and vanity cameras 2013-04-29 08:48:45 -07:00
Glorf
6222b3f52a Bugfix #744 2013-04-29 17:19:20 +02:00
Chris Robinson
d17e1e83d5 Rename MWRender's Player to Camera 2013-04-29 05:50:40 -07:00
Chris Robinson
dbba126344 Use a method to check if the view should be first person 2013-04-29 04:40:28 -07:00
Chris Robinson
bb8277920b Manage the player's NpcAnimation object in the RenderingManager 
It may be more appropriate to manage it in MWRender::Actors with the other
Animation-based objects, but that will need some (minor) interface changes.
 2013-04-29 03:31:46 -07:00
scrawl
6c5ea1ea7a Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes 2013-04-29 12:05:10 +02:00
scrawl
5ff098b8fb Fix quick keys being triggered when in UI mode 2013-04-29 11:55:30 +02:00
scrawl
867c7db014 Fix wrong door sounds 2013-04-29 11:00:15 +02:00
scrawl
9648804af5 Fix terrain material leak, this should in theory allow the terrain to free its temporary resources 2013-04-29 10:20:38 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
Chris Robinson
ba3a67f84b Don't store the player base node in MWRender::Player 2013-04-28 23:44:44 -07:00
Chris Robinson
24e503330b Merge remote-tracking branch 'zini/master' into animations 2013-04-28 09:41:31 -07:00
Marc Zinnschlag
11a45b3034 Merge remote-tracking branch 'scrawl/doors' 2013-04-28 18:22:09 +02:00
scrawl
67e5e939a1 Fix some doors 2013-04-28 17:57:36 +02:00
Marc Zinnschlag
f2a5377b2b Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-28 16:52:48 +02:00
Marc Zinnschlag
116ac05677 Merge remote-tracking branch 'scrawl/doors' 2013-04-28 16:44:11 +02:00
Glorf
98baf9fac1 Bugfix #718 2013-04-28 16:36:12 +02:00
scrawl
6ecd88af14 More fixes 2013-04-28 15:59:59 +02:00
scrawl
4ee1a6ee02 Put door physics in a separate method, some fixes 2013-04-28 15:36:37 +02:00
Marc Zinnschlag
cd61177eed Merge remote-tracking branch 'gus/renderWeaponShield' 2013-04-28 15:00:47 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
Marc Zinnschlag
a6b7f8e904 Merge remote-tracking branch 'scrawl/fall' 2013-04-28 14:14:10 +02:00
Marc Zinnschlag
93c98e1df4 Merge remote-tracking branch 'scrawl/athletics' 2013-04-28 14:11:12 +02:00
Marc Zinnschlag
738a54337d removed redundant case smashing 2013-04-28 14:07:53 +02:00
gus
3d9ceede77 little fix (weapons disapeared when tab was pressed) 2013-04-28 12:33:41 +01:00
gus
5388c25e64 Fix or lockpicks. 2013-04-28 11:55:50 +01:00
gus
766d1efa84 Render weapon and shield. Only shield can be seen right now as weapons need to be drawed out. 2013-04-28 11:41:01 +01:00
scrawl
7d61459ccd Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway. 2013-04-28 11:13:21 +02:00
scrawl
fdf80c1c4f Fix unused variable 2013-04-28 11:05:01 +02:00
scrawl
db78d15fc4 Fix changeWeather 2013-04-28 11:02:30 +02:00
Chris Robinson
ce7bc20fa1 Avoid special-casing player rotation 2013-04-28 01:14:58 -07:00
scrawl
07891fa213 Athletics skill increase 2013-04-28 07:53:04 +02:00
Glorf
3669d0a998 Bugfix #742 2013-04-27 20:57:44 +02:00
Chris Robinson
ab52e68c05 Merge remote-tracking branch 'zini/master' into animations 2013-04-27 05:16:15 -07:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
Glorf
ade871ce12 Corrected unused opcodes 2013-04-26 17:31:58 +02:00
Glorf
89f7ef2472 Move, moveworld script instructions 2013-04-26 17:28:19 +02:00
Marc Zinnschlag
32138dbb0f silenced a warning 2013-04-26 13:33:47 +02:00
Chris Robinson
2822f431c4 Merge remote-tracking branch 'zini/master' into animations 2013-04-26 01:38:51 -07:00
Chris Robinson
b666f1d551 Work around a problem with MWRender::Player::renderPlayer 
NpcAnimation::setViewMode makes a call to the character controller, in the
mechanics manager, to forcefully update the character's state. This in turn
makes a call to the player's old NpcAniamtion object that was just deleted.

The mechanics manager will eventually remove and reinsert the player, so the
old character controller will be removed and a new one will get the right
Animation object again, but not in time for the setViewMode call.

There's many factors that all contribute to this run-around, which needs
discussion on how to best fix.
 2013-04-26 01:30:36 -07:00
Chris Robinson
55ee4e65a9 Clean up the slotlist struct 2013-04-25 23:42:20 -07:00
scrawl
7821610ec6 Make OnDeath work with explicit reference 2013-04-26 02:08:53 +02:00
scrawl
a373f53988 Added SetAtStart 2013-04-26 02:02:51 +02:00
Marc Zinnschlag
4e45222a63 Merge remote-tracking branch 'glorf/rotate-update1' 2013-04-25 20:57:24 +02:00
Glorf
240217ae42 Fixed rotations more than 360 degrees 2013-04-25 20:52:38 +02:00
Marc Zinnschlag
1e9656ee9c Merge remote-tracking branch 'glorf/rotate-update1' 2013-04-25 20:22:40 +02:00
Glorf
7cd4dd0c91 Improved local rotations 2013-04-25 19:14:10 +02:00
Chris Robinson
274f3c7b77 Force character state to update after switching view modes 2013-04-25 07:08:11 -07:00
Chris Robinson
e4eb4b7e30 Keep track of the character looping state 2013-04-25 06:29:17 -07:00
Chris Robinson
9da2c9153e Don't store the animation group string in the character controller 2013-04-25 06:12:37 -07:00
Chris Robinson
2769adcee0 Implement switching to and from first-person animations 
Note that the current animation gets interrupted, so switching to first person
may break movement until you stop and try to move again. This can be fixed by
alerting the character controller in the mechanics manager to force a state
update when switching POV.
 2013-04-25 05:23:05 -07:00
Chris Robinson
9a2a32f2a5 Add a method to clear all Animation sources except the first 
The first needs to remain, since that's where any mSkelBase entity comes from,
and where any retrieved nodes are from.
 2013-04-25 05:02:11 -07:00
Chris Robinson
9be20b90f1 Fix potential infinite loop when layer 0 is empty 2013-04-25 03:35:40 -07:00
Chris Robinson
76c8e81908 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-25 01:35:21 -07:00
Marc Zinnschlag
247a76766d fixed a typo in a doxygen comment 2013-04-25 10:27:43 +02:00
Marc Zinnschlag
71fc8f5830 Merge remote-tracking branch 'scrawl/item' into next 2013-04-25 10:21:14 +02:00
Chris Robinson
86fda1bff6 Only set mSkelBase from the first objectlist 2013-04-25 00:52:26 -07:00
Chris Robinson
7eac37be23 Make sure the old layer is cleared before starting the next 2013-04-25 00:18:02 -07:00
Chris Robinson
09fc50948b Add methods to disable and get info for a layer 2013-04-25 00:08:16 -07:00
Chris Robinson
24f1eba902 Keep track of whether an animation supplies movement 
Also handle it when it doesn't.
 2013-04-24 22:45:43 -07:00
Nathan Jeffords
7db6447a00 dropped the I infront of the journal view model interfaces 2013-04-24 21:53:25 -07:00
Nathan Jeffords
36a6806faf drop the leading 'I' from the book page control interfaces 2013-04-24 21:44:29 -07:00
Nathan Jeffords
4c22afc29b made a pass at conforming to established naming convention 2013-04-24 20:22:57 -07:00
Nathan Jeffords
c7ede9b523 port code to C++03 2013-04-24 20:22:57 -07:00
Nathan Jeffords
718af692c9 reworked journal to match bethesda's implemenation 2013-04-24 20:20:01 -07:00
Nathan Jeffords
f02a53b121 Created a helper class to format books for display from the journal 
view-model data.
 2013-04-24 20:20:01 -07:00
Nathan Jeffords
50d688c2fc Created a view-model to present journal data to the UI in the form it 
intends to display it.
 2013-04-24 20:20:00 -07:00
Nathan Jeffords
55ca037411 Created a MyGUI widget to present a page of formatted text. 2013-04-24 20:20:00 -07:00
Nathan Jeffords
8dad04eef1 hid JournalWindow behind IJournalWindow interface, and put its entire 
implementation, class definition and all, into journalwindow.cpp
 2013-04-24 20:20:00 -07:00
scrawl
9e3917881d Don't fail on nonexistent items in a levelled list 2013-04-25 04:44:30 +02:00
Chris Robinson
0817d59f23 Allow specifying where to start in an animation 2013-04-24 19:09:36 -07:00
scrawl
933f894148 Added Blind and Night Eye effects 2013-04-25 02:31:51 +02:00
scrawl
baa7a9160c Rank condition should always fail if NPC is not in a faction 2013-04-25 02:31:39 +02:00
scrawl
a7092ef2d7 Fix activation not working sometimes 
The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
 2013-04-25 02:31:39 +02:00
Nathan Jeffords
2dc01fe56b fixed the type of iterator uses in MWWorld::Store 
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
 2013-04-25 02:31:39 +02:00
scrawl
51580ead4f Fix consecutive dialogue choices 2013-04-25 02:31:39 +02:00
Marc Zinnschlag
87ce2110dc hotfix for CharacterPreview destructor 2013-04-25 02:31:38 +02:00
scrawl
cd57e3f896 Auto calculate attributes if there are not specified in the NPC record 2013-04-25 02:31:38 +02:00
Glorf
53fb17da10 Rotation system fixes 2013-04-24 21:42:04 +02:00
Chris Robinson
333354fe62 Remove the character controller from the Animation class 2013-04-24 07:10:41 -07:00
Chris Robinson
b80891099e Don't use the character controller to handle text keys 
The Animation class has the Ptr and can call to whatever subsystem is needed.
 2013-04-24 06:48:34 -07:00
Chris Robinson
e8cabc9434 Pass the loop count from loopgroup to the play method 
Instead of queueing each iteration separately.
 2013-04-24 06:32:11 -07:00
Chris Robinson
b482d5be09 Add a method to check if a given layer is playing 2013-04-24 05:23:45 -07:00
Chris Robinson
c58dfbe921 Specify the loop count to Animation::play 2013-04-24 04:56:39 -07:00
Chris Robinson
7241267d5c Make an AnimationValue for each animation layer 2013-04-24 04:41:52 -07:00
Chris Robinson
102b3bdef9 Update position by reference 2013-04-24 01:57:51 -07:00
Chris Robinson
9e05ee53da Avoid looking for the controller if there is no NonAccum node 
Also, make sure there is a controller before updating the position.
 2013-04-24 01:18:08 -07:00
Chris Robinson
544011e096 Fix 'start' text key fallback lookup 2013-04-24 00:40:58 -07:00
Chris Robinson
7e2995bc2f Fix setting up active controllers 2013-04-23 19:43:26 -07:00