mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 23:53:57 +00:00
Code Issues Releases Wiki Activity
9590 commits 108 branches 66 tags 133 MiB
Commit graph

7102 commits

Author SHA1 Message Date
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
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
5c81f20f46 Merge remote-tracking branch 'rohitnirmal/load-weap-icon' 2014-03-27 14:57:55 +01:00
Marc Zinnschlag
ce792cf182 Merge branch 'light' 2014-03-27 14:39:40 +01:00
Marc Zinnschlag
50f1679a4c Merge remote-tracking branch 'jeffreyhaines/master' 2014-03-27 13:40:06 +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
Marc Zinnschlag
53c4878d52 fix for inconsistent case in topic records 2014-03-27 10:01:42 +01: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
Marc Zinnschlag
ed524b2fd4 added bright lighting mode 2014-03-26 18:29:15 +01:00
Marc Zinnschlag
9746f8bd32 added night lighting mode 2014-03-26 17:59:42 +01:00
Marc Zinnschlag
fa29942b27 added day lighting mode 2014-03-26 17:47:56 +01:00
Marc Zinnschlag
d5506172e8 added lighting switching 2014-03-23 15:14:26 +01:00
Marc Zinnschlag
205354ba30 some ambient light cleanup 2014-03-23 13:40:56 +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
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
0c207f7212 Fix build error 2014-03-22 02:08:09 +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
Alexander "Ace" Olofsson
317f1e0b63 Update dialoguesubview.cpp 
That doesn't work on Windows. (Are and/or allowed in C++ in any other compiler?)
 2014-03-21 13:44:01 +01:00
Marc Zinnschlag
41fd94b160 compensated for different coordinate systems 2014-03-21 13:39:22 +01:00
Marc Zinnschlag
1e57d55717 update/close on deletion of reference/referenceable 2014-03-21 13:27:46 +01:00
Marc Zinnschlag
698fe8cce3 update preview title on changed referenceableID (preview for references only) 2014-03-21 12:52:46 +01:00
Marc Zinnschlag
58daf52a67 deal with empty and invalid referenceable ID fields 2014-03-21 12:44:06 +01:00
Marc Zinnschlag
1a9df4bc56 Merge branch 'preview' 2014-03-21 12:35:40 +01:00
Marek Kochanowicz
2a26ff2299 better fix 2014-03-21 12:13:54 +01:00
Marc Zinnschlag
fc8ae2b9b5 fixed encoding problems 2014-03-21 11:56:48 +01:00
Marc Zinnschlag
10ce47938b update preview on reference/referenceable changes 2014-03-21 11:22:43 +01:00
Marc Zinnschlag
2128d3008c Merge branch 'master' into preview 2014-03-21 08:12:06 +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
Marek Kochanowicz
fbb619db73 … 2014-03-20 21:41:11 +01:00
Marek Kochanowicz
a692ce99fa where was my mind… 2014-03-20 20:26:53 +01:00
Marek Kochanowicz
ccd5e549cd moved buttons down 2014-03-20 19:53:03 +01:00
Marek Kochanowicz
832a10b2ac solving problems 2014-03-20 18:40:10 +01:00
Marc Zinnschlag
1a1d52c513 fixed a column ID problem 2014-03-20 14:19:50 +01:00
Marek Kochanowicz
5c34823bb0 added some placeholder icons 2014-03-20 13:59:00 +01:00
Marek Kochanowicz
ad2f9a69a1 prevent deleting already deleted record 2014-03-20 08:59:04 +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
ea9b6fa37e view button 2014-03-19 12:01:36 +01:00
Marek Kochanowicz
8f3103ce65 added preview button 2014-03-19 11:43:25 +01: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
Marek Kochanowicz
010160d047 missed those :/ 2014-03-18 20:56:55 +01:00