scrawl
c010c28337
Implement ToggleWorld instruction
2014-09-30 15:54:09 +02:00
Marc Zinnschlag
850a40d4e2
fixed resources table drag source problem
2014-09-30 13:15:15 +02:00
cc9cii
a9745cce1e
Suppress some compiler warnings.
2014-09-30 21:02:31 +10:00
Marc Zinnschlag
ff530a2e19
added missing magic effect table columns
2014-09-30 12:33:48 +02:00
cc9cii
dee090355f
Changes to compile on Ubuntu 14.04.
2014-09-30 19:23:19 +10:00
cc9cii
687b62dfd3
Revert some changes (mostly iostream adds)
2014-09-30 18:46:26 +10:00
Jordan Ayers
da9d858201
Add 'const' to a spell helper function.
2014-09-29 20:59:10 -05:00
cc9cii
312b7cd571
Merge branch 'master' into QtOGre
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
components/nif/niffile.hpp
libs/openengine/bullet/physic.hpp
2014-09-30 10:52:04 +10:00
scrawl
3e153d0a9b
Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2
2014-09-29 22:30:21 +02:00
scrawl
b345c50a86
Run stepSimulation before moving actors
...
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
7f18f85a1d
Forgot const
2014-09-29 12:04:19 +02:00
cc9cii
7675df60ba
Fix far clip distance (again), workaround for broken settings minimum value.
2014-09-29 08:17:51 +10:00
cc9cii
54c77cf875
Silence clang warnings.
2014-09-29 06:39:44 +10:00
cc9cii
f0c739b763
Apply camera setting changes immediately. Remove current value check for shader setting changes.
2014-09-29 06:27:54 +10:00
scrawl
bdab3fa321
Bullet optimization: Don't update AABBs of static objects every frame
2014-09-28 18:02:57 +02:00
scrawl
ff0b4e0583
Add debug window (F10), displays Bullet's profiler output
2014-09-28 18:02:49 +02:00
scrawl
7c52d05f85
Disable topics list visually when in a choice
2014-09-28 14:00:15 +02:00
scrawl
e9ed0211c9
Attempt to fix Clang warnings
2014-09-28 12:44:47 +02:00
scrawl
58571f7ac2
Revert "Transfer item ownership to the buyer if item wasn't stolen"
...
Fixes #1953 .
This reverts commit 5d77c5e8ca
2014-09-28 12:18:46 +02:00
cc9cii
6e8977348a
Check the FSAA setting of windows rather than system value.
2014-09-28 19:43:26 +10:00
cc9cii
303b0ee8c6
Update scenewidget when antialiasing settings change.
2014-09-28 15:43:33 +10:00
cc9cii
8a0ff17c22
Update SceneWidget when relevant user settings change.
2014-09-28 14:08:14 +10:00
cc9cii
9902e08773
Apply sh::Factory settings immediately.
2014-09-28 11:05:27 +10:00
cc9cii
a25cffc242
Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights.
2014-09-28 10:17:54 +10:00
scrawl
02dec787fd
Cache GMSTs in getDerivedDisposition
2014-09-27 22:44:20 +02:00
scrawl
ea956b537c
Don't search for fFatigueReturnBase and fFatigueReturnMult every frame
2014-09-27 22:37:53 +02:00
MiroslavR
508113f271
Resolve merge conflict
2014-09-27 17:50:17 +02:00
MiroslavR
1c4e52a0e5
Book formatter: Fix an excessive line break case
2014-09-27 17:35:57 +02:00
cc9cii
d790b8edfa
Revert old fix.
2014-09-27 23:39:22 +10:00
cc9cii
a2d043f43a
Re-check unknown record id after loading.
2014-09-27 23:36:27 +10:00
MiroslavR
cb5f661596
Book formatter: Support FONT closing tag, minor code cleanup
2014-09-27 13:31:59 +02:00
Marc Zinnschlag
e47f9c7268
added first batch of magic effect columns (re-using existing columns)
2014-09-27 12:51:46 +02:00
Marc Zinnschlag
aa89370db6
make sure magic effects added by expansions are available
2014-09-27 12:38:42 +02:00
Marc Zinnschlag
25a1112627
add magic effect records for newly created games
2014-09-27 12:26:25 +02:00
cc9cii
810ba61909
While loading overwrite records with the same id. Should resolve bug #1750 .
2014-09-27 17:46:48 +10:00
scrawl
e868a48a63
Don't trigger OnPcHitMe for friendly hits ( Fixes #1950 )
...
Don't consider actors as followers if they are also in combat with the follow target
2014-09-26 22:08:07 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
790e0150b1
Fix global map markers being duplicated when cell is visited again
2014-09-26 16:51:48 +02:00
scrawl
18be152ab1
Allow dragging map even when a marker is hovered
2014-09-26 14:27:52 +02:00
scrawl
603e558fb7
Fix broken getCollidingPc / getCollidingActor (cppcheck)
2014-09-26 14:16:46 +02:00
scrawl
97df7c9b22
Get rid of markers.png and use original MW texture, cleanup
2014-09-26 13:40:10 +02:00
Marc Zinnschlag
23fd314294
added magic effects table
2014-09-26 13:12:17 +02:00
Marc Zinnschlag
c321f2c252
load and save magic effect records
2014-09-26 13:05:51 +02:00
scrawl
4f0fc79ea4
Change global map cell size from 24 to 18 and make it configurable
2014-09-26 12:47:33 +02:00
cc9cii
8e71f092c5
Comment out setMinimum which is broken.
2014-09-26 12:36:55 +10:00
cc9cii
a1c0ec2feb
Repair collateral damage from a purging session gone out of control.
2014-09-26 11:26:33 +10:00
cc9cii
111a35bc38
More strip back.
2014-09-26 07:16:34 +10:00
scrawl
0bc840aadd
Add NumericEditBox widget
2014-09-25 21:04:51 +02:00
scrawl
f56711f443
Fix crash caused by teleportation spells ( Fixes #1904 )
2014-09-25 18:14:04 +02:00
scrawl
8ad2b95208
Revert "AiFollow: return from execute() if target is not player"
...
This reverts commit 061c7813f6Fixes #1898 .
2014-09-25 17:57:10 +02:00
scrawl
40ce5add59
Don't report crime for attacking an NPC that is already in combat with another NPC ( Fixes #1908 , Fixes #1821 )
2014-09-25 17:33:26 +02:00
scrawl
6b65502557
Add properties for new widget classes to MyGUI plugin
2014-09-25 16:25:08 +02:00
scrawl
2066097202
Fix incorrect reading of global map state in some cases when the map size changed ( Fixes #1946 )
2014-09-25 15:28:02 +02:00
scrawl
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
Marc Zinnschlag
33cd04b37d
added missing sound gen table columns
2014-09-25 11:40:45 +02:00
cc9cii
d5c8ff7d73
More removal.
2014-09-25 18:15:34 +10:00
cc9cii
127f9bb30d
Fix reverting to wrong version.
2014-09-25 09:16:10 +10:00
cc9cii
61bab6b1f1
Sanitised version. Some settings are only accessible via manually editing the config file.
2014-09-25 08:15:07 +10:00
scrawl
1afcc7adb5
Add imported font colors from openmw.cfg to MyGUI plugin
2014-09-25 00:04:38 +02:00
scrawl
62ab35881e
Don't advance skills in werewolf mode (thanks Hrnchamd)
2014-09-25 00:03:55 +02:00
scrawl
088d01d727
Minor cleanup
2014-09-24 23:50:28 +02:00
cc9cii
31fb160376
More cleanup.
2014-09-25 06:59:04 +10:00
cc9cii
66852d5392
Code cleanup and revert incorrect settings.
2014-09-24 22:41:49 +10:00
scrawl
0f99a959eb
Update barter offer for all items when another item is added ( Fixes #1935 )
2014-09-24 12:21:19 +02:00
scrawl
a7c0e07d78
Add missing World cleanup for mLevitationEnabled
2014-09-24 12:21:19 +02:00
scrawl
5d77c5e8ca
Transfer item ownership to the buyer if item wasn't stolen ( Fixes #1933 )
2014-09-24 12:21:19 +02:00
scrawl
45b4304237
Store levitation/teleport enabled state in savegames ( Fixes #1923 )
2014-09-24 12:21:19 +02:00
cc9cii
fdf375fb4d
Reusing subviews implemented.
2014-09-24 13:49:19 +10:00
cc9cii
3f9b73812b
Minor fixes and workarounds.
2014-09-24 11:55:22 +10:00
cc9cii
970f3609c9
Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments.
2014-09-24 09:33:19 +10:00
cc9cii
67503c93b2
Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.
2014-09-23 22:33:49 +10:00
Marc Zinnschlag
175d4f3d44
Merge remote-tracking branch 'ragora/playdeathlevelupmusic'
2014-09-23 13:30:50 +02:00
Marc Zinnschlag
56858c98b1
Merge remote-tracking branch 'miroslavr/master'
2014-09-23 13:23:00 +02:00
Marc Zinnschlag
7ab4881661
added sound gen table
2014-09-23 13:21:54 +02:00
cc9cii
d41230a0c5
Tweak the look of the recordfilterbox. Keep titlebar if floating.
2014-09-23 20:51:14 +10:00
Marc Zinnschlag
02247fe712
load and save sound gen records
2014-09-23 12:20:02 +02:00
Ragora
06e683d378
Added code to play music on level up and on death
2014-09-23 04:58:19 -04:00
cc9cii
ffae816aab
Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.
2014-09-23 17:01:08 +10:00
cc9cii
62406d5322
Use reasonable values for the spinbox.
2014-09-23 07:28:55 +10:00
MiroslavR
22c71cec18
Check for text size
2014-09-22 23:17:44 +02:00
cc9cii
437fb774c5
Re-implemented subview minimum size setting.
2014-09-23 07:16:07 +10:00
cc9cii
c8ae8f4a6d
Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.
2014-09-23 06:30:41 +10:00
MiroslavR
608e1518a5
Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2
2014-09-22 21:47:21 +02:00
MiroslavR
f87d7c3fce
Book formatter: Do not insert last page if it's empty, code cleanup
2014-09-22 21:25:41 +02:00
MiroslavR
4b1df64fba
Book parser: Fix comparison between signed and unsigned integer expressions
2014-09-22 16:28:17 +02:00
cc9cii
c4f11785ec
Added a window size change easter egg.
2014-09-22 21:12:26 +10:00
cc9cii
48f96df29d
Fixed checkboxes saving invalid values.
2014-09-22 18:50:48 +10:00
Marc Zinnschlag
aa7fc8ee47
fix for potential script problem during saved game loading
2014-09-22 10:12:07 +02:00
Marc Zinnschlag
5c8ef842b6
Merge branch 'edit'
2014-09-22 09:54:44 +02:00
Marc Zinnschlag
51151bc43e
minor fix
2014-09-22 09:53:07 +02:00
cc9cii
fc8d6da6a2
Added more shader settings.
2014-09-22 16:24:06 +10:00
cc9cii
71a3880884
Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout.
2014-09-22 12:19:18 +10:00
cc9cii
02f8f54192
Fixed checkbox behaviour. Added some shader settings.
2014-09-22 07:50:35 +10:00
MiroslavR
51cd2678ae
Book formatter: Fix last block of text not displaying
2014-09-21 22:25:54 +02:00
MiroslavR
c362ec0f95
Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup
2014-09-21 19:47:52 +02:00
Marc Zinnschlag
3cd717cd47
Merge remote-tracking branch 'lgro/videoplayer'
2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:23:05 +02:00
Lukasz Gromanowski
f5589b42ea
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:09:16 +02:00
cc9cii
17a74da650
Cleaned up comments and dead code.
2014-09-21 21:10:18 +10:00
Lukasz Gromanowski
d77546b7dc
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Deprecated functions were:
- AVCodecContext::get_buffer
- AVCodecContext::release_buffer
Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().
release_buffer usage was removed.
Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 12:58:11 +02:00
cc9cii
dbd1ab05d3
Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.
2014-09-21 20:55:52 +10:00
Marc Zinnschlag
e4b6f135b6
catch exceptions from adding local scripts
2014-09-21 12:43:19 +02:00
Marc Zinnschlag
89beecad8c
Merge remote-tracking branch 'scrawl/master'
2014-09-21 12:24:53 +02:00
scrawl
fb26c2c2de
Fix autocalculated NPCs not having health/magicka/fatigue set correctly ( Fixes #1943 )
2014-09-21 11:39:17 +02:00
scrawl
b1e74e2a85
Remove support for Ogre 1.8 versions
2014-09-21 10:41:13 +02:00
scrawl
3ac04060c1
Fix NPCs being able to practice Block skill
2014-09-20 16:17:09 +02:00
Marc Zinnschlag
cf5c5cbce7
Merge remote-tracking branch 'corristo/osx-openmw-launch-fix'
2014-09-20 14:13:42 +02:00
Marc Zinnschlag
9d316a8745
Merge branch 'records'
2014-09-20 13:59:45 +02:00
scrawl
023d7072f9
Don't play battle music for enemies out of AI processing range
2014-09-20 13:55:57 +02:00
scrawl
d3554084ad
Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file
2014-09-20 13:50:23 +02:00
Marc Zinnschlag
8499ceb35d
set default value for topic when cloning info records
2014-09-20 13:30:36 +02:00
scrawl
f5868f7ae1
Fix layout problems in generate class result dialog
2014-09-20 13:07:38 +02:00
Marc Zinnschlag
8ce87803c4
set default value for cell when cloning references
2014-09-20 12:54:25 +02:00
Marc Zinnschlag
b39cdb7645
fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)
2014-09-20 12:48:51 +02:00
Marc Zinnschlag
90ad3f332a
extending refnum functionality to cloning (and also enable cloning of references to a different cell)
2014-09-20 12:37:25 +02:00
Nikolay Kasyanov
9f7a8462d8
Fix build & OpenCS game runner code on OS X
2014-09-20 13:42:11 +04:00
scrawl
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
2014-09-20 10:40:09 +02:00
Marc Zinnschlag
7733df239e
made CloneCommand a subclass of CreateCommand
2014-09-20 10:36:43 +02:00
scrawl
25e96b8c7b
InteractiveMessageBox: Define a maximum width for the message text
2014-09-20 08:57:16 +02:00
MiroslavR
84d27d55e2
Remove redundant includes
2014-09-20 00:51:46 +02:00
MiroslavR
4f89c3e77a
Rework book formatter ( Fixes #1148 )
2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe
Merge remote-tracking branch 'scrawl/master'
2014-09-19 15:59:59 +02:00
Marc Zinnschlag
bc1eaa035d
Merge remote-tracking branch 'scrawl/fontcolors'
2014-09-19 15:59:10 +02:00
Marc Zinnschlag
2a48c377a8
Merge remote-tracking branch 'miroslavr/master'
2014-09-19 15:55:24 +02:00
scrawl
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
2014-09-19 11:53:35 +02:00
scrawl
cbc242d857
Move item count text to ItemWidget
2014-09-19 09:29:00 +02:00
scrawl
b145d183ae
Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration ( Fixes #1922 )
2014-09-19 09:11:21 +02:00
scrawl
ab9d9c7001
Add magic effect flags from ESM files to esmtool
2014-09-19 08:09:40 +02:00
scrawl
8a3a3baed4
Tweak AiEscort maximum distances
2014-09-19 05:47:45 +02:00
scrawl
b6c6bfe943
Merge cell names when merging cells ( Fixes #1929 )
2014-09-19 05:02:54 +02:00
cc9cii
5dfcd2ed01
Removed standard window size combobox. Rearranged widgets.
2014-09-19 08:29:06 +10:00
scrawl
b39fe85a51
Implement fPCbaseMagickaMult and fNPCbaseMagickaMult
2014-09-18 14:56:43 +02:00
cc9cii
52354b14fc
Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled.
2014-09-18 22:17:37 +10:00
Marc Zinnschlag
3add4bdf35
rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet)
2014-09-18 13:41:29 +02:00
Marc Zinnschlag
6fbffdb98f
fixed reference creator error handling
2014-09-18 12:39:29 +02:00
Marc Zinnschlag
e93ab383ea
set refnum and increment refnum counter when creating a new reference
2014-09-18 12:25:17 +02:00
Marc Zinnschlag
33243c8c16
move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction)
2014-09-18 11:37:23 +02:00
Marc Zinnschlag
144f6ca79a
Merge remote-tracking branch 'scrawl/master'
2014-09-18 09:22:33 +02:00
cc9cii
575780ec0d
Display format settings working.
2014-09-18 17:13:53 +10:00
cc9cii
d9b0c81299
Show status bar setting working (feature #854 ). Turns out signals were not needed, may need to clean up later.
2014-09-18 16:05:32 +10:00
Stanislav
313bdf4e78
fix
2014-09-18 10:25:33 +06:00
scrawl
c05874e1ff
Reset CreatureLevList spawning flag if levelled list returned no creature
2014-09-18 06:06:20 +02:00
scrawl
c19f89976e
Add missing Hit voice dialogue for friendly hits
2014-09-18 05:13:17 +02:00
scrawl
54dac1460c
Run global scripts after running local scripts
...
Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.
2014-09-18 04:33:49 +02:00
scrawl
08499ea51f
Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit
2014-09-18 04:26:12 +02:00
cc9cii
86636bd960
Mouse events to disabled objects implemented via a signal filter.
2014-09-18 12:23:41 +10:00
scrawl
ac97a0f99d
Fix dialogue choices being displayed in incorrect order
2014-09-18 04:10:17 +02:00
scrawl
be7839873a
Don't trigger dynamic stats recalculation when setting up actor initial stats ( Fixes #1927 )
...
This caused the magicka value set in the CS to be ignored completely, so flame atronachs were spawning with 50 magicka instead of 105.
2014-09-18 03:47:45 +02:00
scrawl
447e93bdb4
Use SpellCast animation for creatures that have it (flame atronach)
2014-09-18 03:24:47 +02:00
scrawl
07cd647e75
Fix broken AI for creatures with OnTarget spells (Bug #1927 )
2014-09-18 03:19:13 +02:00
cc9cii
62d2811285
Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events.
2014-09-18 07:52:54 +10:00
scrawl
09042ba6d9
Use object name instead of ID when available for tooltips
2014-09-17 13:03:12 +02:00
U-NSFW-50TH\cc9c
ca80a2b856
Merge remote-tracking branch 'upstream/master' into opencs-settings
2014-09-17 21:00:22 +10:00
scrawl
2eaceb71ba
Reject AiTravel destinations further than 7168 units away, as in vanilla MW ( Fixes #1911 )
2014-09-17 12:39:10 +02:00
Marc Zinnschlag
41275b0af3
Merge remote-tracking branch 'cc9cii/Bug-No-1869'
2014-09-17 09:20:59 +02:00
Marc Zinnschlag
b9973c4515
Merge remote-tracking branch 'scrawl/master'
2014-09-17 09:18:36 +02:00
cc9cii
9dc4af69c6
Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible.
2014-09-17 17:13:21 +10:00
scrawl
441073b475
Remove ancient comment
2014-09-17 07:02:19 +02:00
scrawl
3ce3f31452
Adjust turning animation speed multiplier based on turning speed
2014-09-17 07:02:19 +02:00
scrawl
6debd21ec6
Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep
2014-09-17 07:02:19 +02:00
scrawl
269c200c8f
Fix jump velocity mechanics ( Fixes #1708 )
2014-09-17 07:02:19 +02:00
scrawl
b6a89c7845
Fix idlestorm animation conflict with torch animation
2014-09-17 07:02:19 +02:00
scrawl
4c285151a3
Fix incorrect movement animation for some creatures ( Fixes #1924 )
2014-09-17 07:02:10 +02:00
Stanislav
ebb223b2d3
Feature #1226 : fixes
2014-09-17 09:03:02 +06:00
cc9cii
cb15750e40
Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway.
2014-09-17 06:29:11 +10:00
cc9cii
e3da37567b
Cleaned up and got some signals going.
2014-09-17 06:11:41 +10:00
Marc Zinnschlag
70275350de
rewrote command generation in GenericCreator
2014-09-16 13:28:11 +02:00
Marc Zinnschlag
b31c4e2bcd
Merge remote-tracking branch 'cc9cii/Bug-No-1301'
2014-09-16 12:52:12 +02:00
Marc Zinnschlag
90b45e09f7
added refnum column to references tables
2014-09-16 12:48:10 +02:00
Marc Zinnschlag
f5483e76cf
added refnum counter column to cells table
2014-09-16 12:30:17 +02:00
cc9cii
d679e0e012
Made more progress. Grey out disabled settings.
2014-09-16 19:50:25 +10:00
cc9cii
ffaca7a875
GUI added, but not yet functional.
2014-09-16 07:44:07 +10:00
Stanislav
8574d2330c
Feature #1226 : Request UniversalId editing from table column
2014-09-16 00:00:34 +06:00
Marc Zinnschlag
71c868aa94
Merge remote-tracking branch 'scrawl/master'
2014-09-15 12:45:00 +02:00
Marc Zinnschlag
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
2014-09-15 12:44:38 +02:00
cc9cii
ecb4154ac0
Fixed default settings logic and cleaned up comments.
2014-09-15 19:33:38 +10:00
scrawl
0c75c6bf1b
Improve spellcasting AI for Drain/Damage effects
2014-09-15 10:42:51 +02:00
scrawl
157c53bed4
Handle spellcasting for creatures with no casting animation ( Fixes #1856 )
2014-09-15 10:42:44 +02:00
Marc Zinnschlag
3d8216ee17
fixed broken content file list in case of newly created addons
2014-09-15 09:51:39 +02:00
cc9cii
e4b836608c
Partially address feature #854 by reading the status bar setting from opencs.ini. Missing GUI update that will affect new top level windows.
2014-09-15 06:08:56 +10:00
cc9cii
0ec20b23aa
Initial working version. Video/rendering options supported. No GUI yet.
2014-09-15 06:08:55 +10:00
Marc Zinnschlag
19f469c7db
Merge remote-tracking branch 'scrawl/master'
2014-09-14 12:00:14 +02:00
Marc Zinnschlag
d1d861e1be
Merge branch 'run'
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009
allow project scope scripts
2014-09-14 11:41:28 +02:00
Marc Zinnschlag
89000f6196
removed unused OmwLoader
2014-09-14 11:28:28 +02:00
Marc Zinnschlag
ea60c665dd
Merge remote-tracking branch 'ragora/bounditemflag'
2014-09-14 10:54:07 +02:00
scrawl
233e221de2
Terminate AI packages when target is disabled or deleted ( Fixes #1910 )
2014-09-14 10:49:33 +02:00
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
2014-09-14 10:45:26 +02:00
scrawl
1270dada34
Don't set Attacked flag when the actor is already in combat with the attacker ( Fixes #1909 )
2014-09-14 10:35:57 +02:00
scrawl
002b41ba51
Make changeWeather work when the player isn't in a cell yet (workaround for modTESTchargen_v2_5)
2014-09-14 08:38:54 +02:00
scrawl
4b27950879
Don't apply race height to NPC collision shape ( Fixes #1487 )
2014-09-14 07:04:02 +02:00
scrawl
bd96764229
Mark code that will be obsolete when upgrading to MyGUI 3.2.2
2014-09-14 03:54:50 +02:00
Ragora
b8851790a6
Covered forgotten old bound item checks
2014-09-13 18:59:13 -04:00
Ragora
f250e3df4b
Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit
2014-09-13 18:48:41 -04:00
scrawl
4426b03fa4
Remove some garbage
2014-09-13 22:21:37 +02:00
scrawl
0c273568f2
Increment version number for input configuration
...
Old files are broken by keycode->scancode switch (319f4e0547
2014-09-13 21:45:03 +02:00
scrawl
99c276baa9
Set weapon Magical flag when enchanting a weapon
2014-09-13 21:23:44 +02:00
scrawl
a42e60970b
Revert "delete death events on adding an actor to the scene"
...
If we go to a different cell in the exact frame of an actor's death, the death event would be lost permanently.
This reverts commit fd2c07a6f4
2014-09-13 20:57:25 +02:00
scrawl
8625764143
Give 100% of health back when Resurrecting an actor ( Fixes #1877 )
2014-09-13 20:50:49 +02:00
Marc Zinnschlag
081588f484
add project file to content file list when running OpenMW from OpenCS
2014-09-13 20:48:24 +02:00
