krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
9750 commits 35 branches 0 tags 65 MiB
Commit graph

5821 commits

Author SHA1 Message Date
cc9cii
325d0616bb Cleanup debug statements. 2014-04-03 22:17:45 +11:00
cc9cii
98f77714ce Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder. 
This version still has debugging statements and needs cleaning up.
 2014-04-03 21:43:44 +11:00
Jeffrey Haines
b1abef7a38 Cleaned up code 2014-04-03 01:07:56 -04:00
Jeffrey Haines
58b135a2be Crime is now checked every frame call 2014-04-03 00:50:09 -04:00
cc9cii
f597d3e88b Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors). 2014-04-03 07:46:26 +11:00
Jeffrey Haines
510f2d10ac Replaces broken code with todo 2014-04-02 14:20:33 -04:00
Jeffrey Haines
6f1211dd8d Moved mWitnesses into Player. resetCrime for paying fine. 2014-04-02 12:23:38 -04:00
Jeffrey Haines
7c0b51fb7e Ai pursue now controls guards pursuit of crimes 
Should extend AiActivate in the future
 2014-04-02 00:18:22 -04:00
Jeffrey Haines
50dac98a2b Feature 1154 & 73: Crime and NPC reactions 2014-04-01 20:24:25 -04:00
Jeffrey Haines
4037f3705e Feature 1154 & 73: NPCs react to crime 2014-04-01 14:15:55 -04:00
Marc Zinnschlag
12e46c5dc7 Merge remote-tracking branch 'megaton/master' 2014-03-31 10:24:12 +02:00
Marc Zinnschlag
4ee1069baa Merge remote-tracking branch 'scrawl/master' 2014-03-31 10:11:54 +02:00
scrawl
f5810b8e1c Consider aspect ratio for loading screen background 
More consistent with the main menu.
 2014-03-30 23:07:49 +02:00
scrawl
1265131203 Set the selected index after all items are added (workaround for MyGUI bug) 2014-03-30 20:07:43 +02:00
megaton
50af9bc0d3 General perfomance optimizations. 2014-03-30 19:45:27 +04:00
cc9cii
d04bb3befb MSVC uses C version of locale. 2014-03-30 17:23:22 +11:00
Jeffrey Haines
8ce938c6f1 Revert 6b28c06..98fd381 
This rolls back to commit 6b28c06b2c.
 2014-03-29 22:26:53 -04:00
Jeffrey Haines
98fd381564 Feature #1154 Not all NPCs get aggressive when one is attacked 
Compiling fix
 2014-03-29 21:25:20 -04:00
Jeffrey Haines
6c866deb1b Feature #1154 Not all NPCs get aggressive when one is attacked 
Partially implemented
 2014-03-29 21:23:34 -04:00
scrawl
5eeed03f5b Only exchange bribe gold if the bribe was accepted 2014-03-30 00:12:31 +01:00
scrawl
72df9e77c6 Don't show version text in the pause menu 2014-03-30 00:07:32 +01:00
gus
d9ea7107b7 compile fix. 2014-03-29 18:36:32 +01:00
gus
bee057346b Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
 2014-03-29 18:05:56 +01:00
Marc Zinnschlag
adab85eeb7 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-29 13:29:06 +01:00
Jeffrey Haines
6b28c06b2c Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe 2014-03-29 07:47:41 -04:00
Jeffrey Haines
ad9286a30f Revert "Revert "made mReceiver private"" 
This reverts commit 33aecc5218.
 2014-03-29 07:45:56 -04:00
Jeffrey Haines
33aecc5218 Revert "made mReceiver private" 
This reverts commit 3e8f7b3bae.
 2014-03-29 07:45:36 -04:00
Marc Zinnschlag
c7b969821f silenced a warning 2014-03-29 11:11:43 +01:00
Marc Zinnschlag
27095f3edb Merge remote-tracking branch 'cc9cii/AiWander-improvements' 2014-03-29 11:08:51 +01:00
cc9cii
ebb1813b9b Minor comment clarification. 2014-03-29 20:17:04 +11:00
cc9cii
07fd801d94 My previous analysis of the pathfinding issue was incorrect. It was in fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points. 
There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily.  The check mCell != cell in buildPath() is being triggered frequently. Not sure why.
 2014-03-29 19:35:52 +11:00
cc9cii
267855c44e Prevent NPC suicides off silt the strider platform in Seyda Neen. Added some comments as well. There may be opportunities for some optimization but left that out for now. 2014-03-29 19:35:52 +11:00
cc9cii
90a813ad2c Allow interrupting a walking NPC to trigger a greeting. 2014-03-29 19:35:52 +11:00
Marc Zinnschlag
04baa4a573 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-29 08:14:04 +01:00
Jeffrey Haines
3e8f7b3bae made mReceiver private 2014-03-29 02:59:47 -04:00
Jeffrey Haines
13d330e427 Feature #1233 Bribe gold not in inventory 
Gold is now put into inventory receivers when bribing.
 2014-03-28 21:16:42 -04:00
Marc Zinnschlag
86e5179fd8 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-28 22:40:12 +01:00
Jeffrey Haines
9efef31bb8 Feature #953 Trader Gold - Unused code/warning resolved 
Removed unused code
getBaseGold throws proper error
 2014-03-28 17:27:23 -04:00
Marc Zinnschlag
c38812d026 Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-28 19:34:40 +01:00
Jeffrey Haines
401d21b4ee getBaseGold implemented in MWWorld::Class for NPC and Creature 
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
 2014-03-28 14:21:38 -04:00
Jeffrey Haines
895748f18d Gold Pool implemented for Vendors 
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
 2014-03-28 12:01:56 -04:00
Marc Zinnschlag
2c2106205d Merge remote-tracking branch 'scrawl/master' 2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21 Bug #1224: Changed fix to potentially allow for language independent saves 2014-03-27 22:32:42 +01:00
scrawl
4f852daf45 Don't play company logo when using --skip-menu 2014-03-27 19:59:33 +01:00
scrawl
f2cd37edd0 Play company logo movie 2014-03-27 19:51:48 +01:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28 Add proper main menu (background image, logo animation, title music) 2014-03-27 15:25:01 +01:00
Marc Zinnschlag
5c81f20f46 Merge remote-tracking branch 'rohitnirmal/load-weap-icon' 2014-03-27 14:57:55 +01:00
Jeffrey Haines
6896142db1 Trader Gold Reset Delay 
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
 2014-03-27 07:30:24 -04:00
Jeffrey Haines
2a8bf46607 Trader Gold Reset Delay 
Implemented traded gold reset delay.

Note:
Traders gold pool is still in inventory.
 2014-03-27 01:23:56 -04:00
Rohit Nirmal
e695890e01 Only update the icon if player is NOT unarmed, to avoid bad dereference. 2014-03-26 21:53:35 -05:00
Rohit Nirmal
bcacdc49af Update weapon icon in HUD when save is loaded. 2014-03-26 21:08:31 -05:00
scrawl
27956f3624 Savegame dialog: Hide main menu after successful load 2014-03-27 02:36:21 +01:00
scrawl
e5e1e84c52 Ask for confirmation to exit OpenMW 2014-03-26 22:05:21 +01:00
scrawl
a5598e9c2e Add Credits button to main menu (plays mw_credits.bik) 2014-03-26 21:38:57 +01:00
scrawl
23f4bbc5b0 Videoplayer: only pause previous sounds if there is an audio stream 2014-03-26 21:36:57 +01:00
scrawl
5562c78ac4 Ask for confirmation when selecting 'New Game' 2014-03-26 21:11:39 +01:00
scrawl
ecfaa41e93 Savegame dialog: use locale-aware datetime format 2014-03-26 20:56:39 +01:00
scrawl
53ba23e303 Fixes #1224: Store class name instead of id in savegame header 2014-03-26 19:56:12 +01:00
scrawl
793649c854 ToggleAI: Report current status on toggle 2014-03-26 19:55:52 +01:00
scrawl
688415ce54 Play deathknockout/deathknockdown animations when appropriate 2014-03-26 18:55:16 +01:00
Marc Zinnschlag
1b6b4e3442 Merge remote-tracking branch 'slothlife/weather_save' 2014-03-23 08:36:45 +01:00
cc9cii
772a49b2a6 Just some notes for future maintenance. 2014-03-23 13:38:11 +11:00
scrawl
0a17245633 Refactored settings window 2014-03-22 19:02:14 +01:00
Marc Zinnschlag
87ae03b5d4 fix for previous commit 2014-03-22 16:39:24 +01:00
Marc Zinnschlag
6bd3b3ee78 include local variable state in saved games 2014-03-22 15:00:49 +01:00
Marc Zinnschlag
4d80bc009a Merge remote-tracking branch 'scrawl/master' 2014-03-22 09:54:42 +01:00
scrawl
394284d0f8 Fixes #1209: Tarhiel never falls 
There are a few pitfalls with this code:
 - Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?)
 - The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.
 2014-03-22 02:08:04 +01:00
slothlife
6dce3e5186 Fixed include to use C99 header, not C++11 header 2014-03-21 01:33:11 -05:00
slothlife
6eab9c5179 Move weather state save/load to a new class 2014-03-21 01:19:40 -05:00
Rohit Nirmal
e3a9daf921 Play item sound when trying to sell a bound item, too. 2014-03-20 22:22:31 -05:00
Marc Zinnschlag
688e03a9d2 Merge remote-tracking branch 'sirherrbatka/Editor-Dialog' 2014-03-20 22:27:28 +01:00
slothlife
1acd1bd913 Feature #1173: Saved Game: include weather state 
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
 2014-03-20 01:25:52 -05:00
Rohit Nirmal
e4c4747a27 Play item sound even if merchant doesn't purchase it. 2014-03-19 20:08:01 -05:00
Marek Kochanowicz
6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
 2014-03-19 10:23:15 +01:00
scrawl
128a47570e One more fix 2014-03-17 14:15:52 +01:00
scrawl
4443e22387 Build fix 2014-03-17 13:32:13 +01:00
scrawl
c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 2014-03-16 23:49:06 +01:00
scrawl
81dfc26d26 mwscript/locals was added twice 2014-03-16 21:39:46 +01:00
Marc Zinnschlag
8b36de6c67 Merge remote-tracking branch 'cc9cii/Slaughterfish-fix' 2014-03-16 12:57:38 +01:00
Marc Zinnschlag
afbdd84467 Merge remote-tracking branch 'cc9cii/AiWander-fix' 2014-03-16 12:47:30 +01:00
cc9cii
f71fb83bfc Cleaned up more inaccurate comments. 2014-03-16 20:56:11 +11:00
cc9cii
f57c11254f Revert to original variable names. 2014-03-16 20:09:18 +11:00
cc9cii
22c544d9d7 Remove unnecessary comment. 2014-03-16 12:51:12 +11:00
cc9cii
fdbd564700 Apparently fall trace needs to be done with the middle of the object. 2014-03-16 08:57:55 +11:00
cc9cii
43757efdc4 Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however. 2014-03-16 08:09:14 +11:00
scrawl
d08394bf78 Fixes #1205: apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla) 2014-03-15 21:00:25 +01:00
scrawl
61955111f1 Fixes #1204: Any health value < 1 should show as empty life bar. 2014-03-15 20:48:54 +01:00
scrawl
93c21b5ef2 Fixes #1197: incorrect mouse wheel step 2014-03-15 20:34:12 +01:00
scrawl
3880247017 Fixes #1206: effect texture override was not accounted for 2014-03-15 20:28:48 +01:00
Marc Zinnschlag
2fdf80bcbf Merge remote-tracking branch 'gsedej/master' 2014-03-15 13:53:05 +01:00
cc9cii
e6977d00e8 Oops. Fix typo picked up by Zini. 2014-03-15 08:16:35 +11:00
cc9cii
b2e3fa70c2 Fix spelling errors in comments. 2014-03-14 07:04:39 +11:00
cc9cii
d54ae58ec9 Bug #900 fix - minor update to comments 2014-03-14 00:09:03 +11:00
cc9cii
d92740efc9 Bug #900 fix - only fixed AiWonder, AiCombat, AiTravel and others may need a different strategy to this. 2014-03-13 23:44:52 +11:00
Marc Zinnschlag
7bc97fb8b8 reworked code for player positioning on startup and new game 2014-03-13 13:19:32 +01:00
Gašper Sedej
43a12fffd5 indentation issue... 2014-03-12 14:37:44 +01:00
Gašper Sedej
d72a2f1ffb Added code to test if git hash is availible 2014-03-12 12:33:42 +01:00
scrawl
0cd40294a2 Fixed ranged combat for creatures 2014-03-12 11:30:44 +01:00
Gašper Sedej
06e02ed77f Added version and revision number to mainmenu 2014-03-12 10:53:56 +01:00