Thomas
61341d4206
Removed mLocked, kept it as "Negative lock level means unlocked"
2014-04-23 10:00:18 -04:00
graffy76
8c6c70ee9c
Merge branch 'master' of https://github.com/graffy76/openmw
2014-04-23 07:05:34 -05:00
Thomas
6022ffbd1f
Evidence chest now locks when new evidence is added to it
2014-04-23 05:54:18 -04:00
Thomas
420163d35f
Small changes to lock command (If no valid lockLevel exists, defaults to 100)
2014-04-23 05:19:34 -04:00
Thomas
cac8e52154
Seperated locked and lock level, to allow for relocking doors to previous lock level.
...
The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.
2014-04-23 05:12:07 -04:00
Thomas
e71a119c23
Made aifollowers run when long distances (800 or 10000, depending) from what they're following.
2014-04-23 02:57:48 -04:00
graffy76
4b607d658f
Re-link user settings to editor main application
2014-04-22 22:19:53 -05:00
graffy76
e3384e3999
relocate support.hpp / remove support.cpp
2014-04-22 22:19:03 -05:00
graffy76
331df17b48
Added new framework files
2014-04-22 22:17:19 -05:00
graffy76
d3148555fa
Delete old framework files
2014-04-22 22:16:14 -05:00
mrcheko
fbd0ffe86f
enable z-moving for flying/water combatants
2014-04-22 22:59:39 +04:00
scrawl
9998c2783e
Fix travis
...
Why again do we need a unit test for something that was never used?
2014-04-21 17:37:06 +02:00
mrcheko
f811abb752
pathgrid shortcutting extended
2014-04-20 20:35:07 +04:00
Marc Zinnschlag
86bd2f48dc
removed an unused function
2014-04-20 17:28:10 +02:00
Marc Zinnschlag
0eed697f9a
Merge remote-tracking branch 'digmaster/master'
2014-04-20 13:36:39 +02:00
Marc Zinnschlag
a91b386381
Merge remote-tracking branch 'jeffreyhaines/master'
2014-04-20 13:34:58 +02:00
cc9cii
6a1435c49e
Remove rotation check that was freezing NPC's.
2014-04-20 17:59:08 +10:00
cc9cii
e17fab891d
Suppress travis warning and one more tweak.
2014-04-20 16:49:57 +10:00
Thomas Luppi
d6f1f129eb
Forgot to capitalize something. whooooops
...
dat y do
2014-04-20 00:39:50 -04:00
Thomas Luppi
95ef874205
Gets default keybindings from scancode, not keyvalue.
...
Gives keyboard set-up independant default keybindings; useful for
international keyboards or dvorak users
2014-04-20 00:34:58 -04:00
cc9cii
2b544d550b
Fixed the rotation animation glitch.
2014-04-20 14:27:18 +10:00
cc9cii
000afa48b7
An attempt at making turning animation smoother. Copied some code from AiCombat for rotation.
2014-04-20 11:59:47 +10:00
cc9cii
3d26702f5e
Make idle actors face the player. Turning animation is not smooth.
2014-04-20 10:36:01 +10:00
cc9cii
9bd31b6236
Added reaction time and moved game setting variables init to the constructor.
2014-04-20 10:06:03 +10:00
Jeffrey Haines
3484df0743
Fixed garage value found in beta's static analysis
...
Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844
2014-04-19 19:42:49 -04:00
Jeffrey Haines
6733a1541e
Fixes to Crime System
...
Victimless crimes were removed because victims may not exist in the
case of stealing items.
Is class now uses case insensitive comparison.
Fixed issue with confiscation of stolen items.
2014-04-19 19:03:31 -04:00
cc9cii
3dfd08cf2d
Cleanup and little tweaking.
2014-04-20 08:31:02 +10:00
cc9cii
479a94b35d
Backing off closed doors working, needs cleanup and tweaking.
2014-04-20 08:14:54 +10:00
Marc Zinnschlag
7eb6a2e52d
Merge remote-tracking branch 'scrawl/alarm'
2014-04-18 16:19:28 +02:00
Marc Zinnschlag
34092f9f5d
Merge remote-tracking branch 'scrawl/master'
2014-04-18 15:08:30 +02:00
scrawl
b3916e7744
Crime: mark witnesses as alarmed.
...
Fixes guard dialogue to properly detect if the player turned himself in.
2014-04-18 13:44:09 +02:00
scrawl
4625adfb7f
Fix typo in a condition.
2014-04-18 11:43:37 +02:00
cc9cii
7437647f70
Forgot to add a guard :-(
2014-04-18 16:45:31 +10:00
cc9cii
a0fc514df7
Suppress compiler warning.
2014-04-18 15:45:39 +10:00
cc9cii
c652cb1568
More cleaning up.
2014-04-18 15:19:22 +10:00
cc9cii
2447f0f4aa
Cleaned up logging statements.
2014-04-18 14:41:44 +10:00
cc9cii
aad13d315c
Fixed issue where allowed nodes were being erased. PathFinder was returning an empty path if the closest pathgrid point to the start was also the closest pathgrid point to the goal. Still need to clean up and remove logging statements.
2014-04-18 14:41:44 +10:00
cc9cii
d3be725ee7
Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points.
2014-04-18 14:41:43 +10:00
cc9cii
1ceeeb4a22
Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck.
2014-04-18 14:41:43 +10:00
Marc Zinnschlag
65161c3e24
Merge remote-tracking branch 'sirherrbatka/less-signals'
2014-04-16 10:22:20 +02:00
Marc Zinnschlag
ce33912980
Merge remote-tracking branch 'sirherrbatka/AngryFix'
2014-04-16 10:21:59 +02:00
Marc Zinnschlag
a7cece3d30
do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit
2014-04-15 22:34:15 +02:00
Marek Kochanowicz
8fba71101c
removed signals
2014-04-15 20:39:19 +02:00
Marek Kochanowicz
fc1837e2ed
fixed bug: regions can be dragged
...
ps
fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu
2014-04-15 19:26:43 +02:00
Marc Zinnschlag
30d5040f2f
Merge remote-tracking branch 'cc9cii/Bug-No-1260'
2014-04-15 15:26:58 +02:00
cc9cii
1fc030653f
Avoid hard coding "thief.dds" string.
2014-04-15 22:30:41 +10:00
Marc Zinnschlag
86e65944b8
Merge remote-tracking branch 'jeffreyhaines/master'
...
Conflicts:
apps/openmw/CMakeLists.txt
2014-04-15 11:31:48 +02:00
Jeffrey Haines
e2fab228f9
Save state is handled correctly now.
2014-04-14 18:11:04 -04:00
mrcheko
4e7ee97050
fix for windows builds
2014-04-14 17:18:29 +04:00
cc9cii
89be1069a7
Bug #1260 : show thief.dds image for a custom class level up menu
2014-04-14 18:31:46 +10:00
Marc Zinnschlag
71068ae3ad
Merge branch 'regionmap'
2014-04-13 17:24:08 +02:00
Marc Zinnschlag
d188e68227
added f-type hint to TableSubView
2014-04-13 16:40:41 +02:00
Marc Zinnschlag
097c063b8a
added 'view in table' action to region map
2014-04-13 16:40:16 +02:00
Marc Zinnschlag
2eca9e72fd
added view action to region map
2014-04-13 15:46:31 +02:00
Marc Zinnschlag
1892550833
added set/unset region actions to region map
2014-04-13 15:32:49 +02:00
Marc Zinnschlag
fc4195a88f
added create cell menu item to regionmap
2014-04-13 14:17:18 +02:00
Marc Zinnschlag
19b31c4146
always use the cell ID instead of the exterior coordinate fields from the original cell struct
2014-04-13 14:16:59 +02:00
Marc Zinnschlag
decd4270d9
added CellId role to RegionMap model
2014-04-13 13:59:27 +02:00
cc9cii
966ed46870
Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status.
2014-04-13 18:34:08 +10:00
cc9cii
3e6e325e5b
Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr).
2014-04-13 14:53:36 +10:00
cc9cii
e9be6d3f42
Fix falling animation where vec.z is set to zero.
2014-04-13 11:34:59 +10:00
cc9cii
0bef754873
Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271 .
2014-04-13 08:46:02 +10:00
Marc Zinnschlag
2f63eb7ca4
added missing edit lock for record reordering
2014-04-12 20:07:09 +02:00
cc9cii
d2a41167d0
Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075
2014-04-11 21:24:00 +10:00
Marc Zinnschlag
d0ea23431c
replaced CellIndex typedef with new CellCoordinates class
2014-04-11 10:06:16 +02:00
Marc Zinnschlag
0516d95253
added context menu with selection functions to region map
2014-04-10 22:12:09 +02:00
Marc Zinnschlag
7f12733463
Merge remote-tracking branch 'potatoesmaster/1071'
2014-04-08 21:08:59 +02:00
Emanuel Guevel
09bd0324c9
Fail properly when a content file is not found
2014-04-08 20:19:09 +02:00
Marc Zinnschlag
d205d5f0af
Merge branch 'cellselect'
2014-04-08 09:58:00 +02:00
Marc Zinnschlag
e0550ba336
allow multiple cell coordinates in c-type hint for scene subviews
2014-04-07 15:23:14 +02:00
Marc Zinnschlag
0d352cb883
replaced rectangular cell selection with a CellSelection object
2014-04-07 14:16:02 +02:00
Marc Zinnschlag
67965ec10c
added CellCoordinates and CellSelection classes
2014-04-07 13:44:43 +02:00
Marc Zinnschlag
324b2743d4
removed grid button (discarding the first attempt at a cell selector)
2014-04-07 10:21:26 +02:00
Marc Zinnschlag
03b3487f1b
minor cleanup
2014-04-07 09:56:36 +02:00
Marc Zinnschlag
fafb7501e3
Merge remote-tracking branch 'cc9cii/PathFinder-split'
2014-04-07 09:48:15 +02:00
Emanuel Guevel
ce7aa96371
Fix visual glitch happening when closing inventory while sneaking
...
(bug #1255 )
2014-04-06 22:21:28 +02:00
Marc Zinnschlag
c7f2cfeca0
Merge remote-tracking branch 'gus/AIFix2'
2014-04-06 15:13:30 +02:00
Jeffrey Haines
a274b48f2f
States are saved. Crime is reacted to.
...
Issues where some crime is ignored. Needs a lot more work
2014-04-05 22:45:40 -04:00
Jeffrey Haines
940c88d2ec
Cleaned up code, implemented crime ids
...
There is a problem with my game freezing. ToggleAi stops my character
2014-04-05 10:26:14 -04:00
Marc Zinnschlag
0fe67b586a
increased scene toolbar button size
2014-04-05 13:16:13 +02:00
Jeffrey Haines
df5cbe5dec
Minor changes
2014-04-04 08:10:35 -04:00
cc9cii
28f7c42fb7
One more comment fix.
2014-04-04 18:17:42 +11:00
cc9cii
f59226265a
Remove redundant parameter from aStarSearch. Also update some comments.
2014-04-04 18:10:06 +11:00
Jeffrey Haines
70919ba60a
Removed witnesses and minor changes
2014-04-03 16:13:14 -04:00
cc9cii
5cf8e7e933
Remove logging.
2014-04-04 06:16:26 +11:00
cc9cii
040d4f8fc4
Move PathgridGraph into separate files.
2014-04-04 06:13:47 +11:00
Jeffrey Haines
0c957a3cde
Added witnesses to the mix
2014-04-03 14:53:31 -04:00
Marc Zinnschlag
baf30ba292
added grid tool (does not work yet)
2014-04-03 14:44:48 +02:00
cc9cii
a8b2eb1fe9
Make Travis happy.
2014-04-03 22:49:22 +11:00
Marc Zinnschlag
3a58da9ad7
size adjustment
2014-04-03 13:30:22 +02:00
cc9cii
325d0616bb
Cleanup debug statements.
2014-04-03 22:17:45 +11:00
Marc Zinnschlag
5d422fec8a
fixed scene toolbar layout problems
2014-04-03 13:00:19 +02: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
5b5069535e
keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly
2014-04-01 10:04:14 +02: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
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
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
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
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
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
Marek Kochanowicz
c0b2b783cb
use more proper creators
2014-03-18 20:53:21 +01:00
Marek Kochanowicz
f3475f7ef5
Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog
2014-03-18 19:24:10 +01:00
Marek Kochanowicz
db774b02d7
clone and create buttons work
2014-03-18 09:36:22 +01:00
Marek Kochanowicz
95afca0558
delete record button
2014-03-17 19:28:41 +01:00
