Marc Zinnschlag
8a37d3ad8c
Merge remote-tracking branch 'scrawl/sky'
2015-09-22 08:33:33 +02:00
scrawl
385f4f729c
Implement SunDiscSunsetColor, fade the sun during sunrise & sunset
2015-09-21 19:43:48 +02:00
scrawl
1a1f1fae87
Minor cleanup
2015-09-21 17:50:36 +02:00
scrawl
d812434fee
Add a subtle fading effect to the sun flash texture
2015-09-21 17:48:24 +02:00
scrawl
854fd9fe05
Remove dead code
2015-09-21 17:20:09 +02:00
scrawl
9bb6c3f288
Improve accuracy of sun occlusion query (use circular shape)
2015-09-21 17:20:09 +02:00
scrawl
96b31d3bba
Scale the sun flash texture depending on occlusion query
2015-09-21 17:20:08 +02:00
scrawl
a2a4532e71
Add the full-screen sun glare effect
2015-09-21 17:20:08 +02:00
scrawl
ac5d0bf405
Render the sun flash (not adjusted based on occlusion yet)
2015-09-21 17:20:08 +02:00
scrawl
89d9323c2b
Document RenderBin numbers in a common header to keep them organised
2015-09-21 17:20:08 +02:00
scrawl
d191a52847
Create occlusion query nodes for the sun flash
2015-09-21 17:20:08 +02:00
scrawl
6bafa564d4
Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture
2015-09-21 17:19:53 +02:00
Marc Zinnschlag
39b7340580
added mouse button settings for 3D scene (not in use yet)
2015-09-21 15:32:18 +02:00
Marc Zinnschlag
41191ea367
Merge remote-tracking branch 'dteviot/FixStuckDraft'
2015-09-20 09:50:18 +02:00
scrawl
8de3ce90a7
Add comments for weather IDs
2015-09-19 18:04:24 +02:00
Marc Zinnschlag
1566f3568d
Merge remote-tracking branch 'origin/master'
2015-09-19 11:27:35 +02:00
dteviot
60d0ad9283
When stuck, try moving backwards as well as to side.
2015-09-19 16:14:00 +12:00
dteviot
5369d20682
Moved pathfinding logic from AiCombat to Pathfinding.
2015-09-19 15:34:02 +12:00
scrawl
a37dee09e2
Fix invisibility effect disappearing after a view mode switch
2015-09-18 21:30:02 +02:00
scrawl
18d0cae801
OpenCS: Select objects with the right mouse button
2015-09-18 18:31:43 +02:00
scrawl
41ea76fd83
OpenCS: Add selection outline effect to CSVRender::Object
2015-09-18 18:31:05 +02:00
scrawl
dac3b33efb
OpenCS: Pass events from the QGLWidget to the RenderWidget
2015-09-18 18:30:48 +02:00
scrawl
169fc6a61b
OpenCS: Remove margin around the render window
2015-09-18 18:29:22 +02:00
Marc Zinnschlag
b58a63e14e
Merge remote-tracking branch 'scrawl/deathanim'
2015-09-17 14:54:29 +02:00
Marc Zinnschlag
1aa926c7e0
restored T-shortcut (focus toolbar) in scene widget
2015-09-17 12:41:56 +02:00
Marc Zinnschlag
659b87b25f
more cleanup
2015-09-17 11:31:25 +02:00
Marc Zinnschlag
b3b4fb3efb
removed some left-over signal slot stuff that shouldn't have been there in the first place
2015-09-17 11:27:55 +02:00
Marc Zinnschlag
96880b4dfe
Merge remote-tracking branch 'scrawl/tabs'
2015-09-17 09:30:31 +02:00
Marc Zinnschlag
c35ce88ee7
Merge remote-tracking branch 'scrawl/aiming'
2015-09-17 09:25:33 +02:00
Marc Zinnschlag
ed373aa320
Merge remote-tracking branch 'scrawl/animation'
2015-09-17 09:24:11 +02:00
scrawl
a7f898057b
Don't activate the initial death animation when skipAnim is set ( Fixes #2513 )
2015-09-17 04:38:42 +02:00
scrawl
c4b5a41ac3
Improve combat AI vertical aiming ( Fixes #1366 , Fixes #1330 )
2015-09-17 03:41:15 +02:00
Emmanuel Anne
29a84452ab
durations in tooltips : use "show effect duration" setting
2015-09-16 22:42:54 +02:00
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
2015-09-16 20:45:37 +02:00
Emmanuel Anne
b0d373f7e6
durations in tooltips : water walking effects is seen differently
...
so move the duration info out of this block...
2015-09-16 19:19:29 +02:00
Emmanuel Anne
1472711583
add duration to spell icons too
...
and use gmststrings instead of direct strings in tooltips
durations can display minutes and hours
I don't know any effect lasting an hour or more but you never know...
2015-09-16 17:53:14 +02:00
Emmanuel Anne
47e29480ce
show duration of light sources in tooltip
...
I had forgotten light sources disappear after a while, this way at least
you know it's normal !
2015-09-16 17:53:06 +02:00
scrawl
f8d4bc378f
Move setAlpha from NpcAnimation to Animation ( Fixes #2917 )
2015-09-16 16:15:55 +02:00
scrawl
126960261f
Keep playing IdleSneak on the lower body when casting spells / using weapons
2015-09-16 16:14:17 +02:00
scrawl
5692ef1eae
Add convenience operator [] to AnimPriority
2015-09-16 15:43:42 +02:00
scrawl
84747fbdd7
Use the actual sneak state to determine visibility of indicator ( Fixes #2915 )
2015-09-16 15:37:36 +02:00
Marc Zinnschlag
c693656307
Merge branch 'localvarfix'
2015-09-15 14:01:45 +02:00
Marc Zinnschlag
2a981a5272
make sure local variables are loaded when trying to access them from outside of a script ( Fixes #2659 )
2015-09-15 13:58:07 +02:00
Marc Zinnschlag
82cb16b83c
Merge remote-tracking branch 'cc9cii/opencs-edit-creature'
2015-09-15 09:14:56 +02:00
dteviot
0feae19140
AiCombat use evadeObstacles() from AiPackage.
2015-09-14 19:57:22 +12:00
Marc Zinnschlag
2c37731494
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-09-12 08:41:12 +02:00
dteviot
8e2fe1985d
Fixed errors pointed out by Zini.
...
1. Removed "Actor" from name of function isActorNearInactiveCell().
2. Corrected case of CoordinateConverter member function names.
2015-09-12 14:17:46 +12:00
cc9cii
1365b8edd1
Fix typo.
2015-09-12 11:18:07 +10:00
cc9cii
45aee1b508
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
2015-09-12 10:15:32 +10:00
cc9cii
5a5e1a3b22
Add missing fields for editing creatures.
...
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)
2015-09-12 10:00:23 +10:00
cc9cii
c4a900ca2c
Rationalise the use of ColumnIds
2015-09-12 09:33:11 +10:00
cc9cii
258b2ba29a
Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.
2015-09-12 09:04:43 +10:00
Marc Zinnschlag
0ff786bebd
Merge remote-tracking branch 'origin/master'
2015-09-11 13:22:31 +02:00
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
2015-09-11 13:22:15 +02:00
Marc Zinnschlag
5be176ee85
disable on-demand loading of land data (for now, maybe)
2015-09-11 13:02:24 +02:00
Marc Zinnschlag
23fde87816
fixed an indexing error
2015-09-11 10:50:19 +02:00
dteviot
10eabc9d51
actorutil.hpp includes mwworld/ptr.hpp
...
As pointed out by Scrawl, fixes compiler error if getPlayer() is called before MWWorld::Ptr is defined, because getPlayer() returns a Ptr by value.
2015-09-11 18:43:06 +12:00
Marc Zinnschlag
584a7a66b9
various minor fixes
2015-09-10 12:41:31 +02:00
dteviot
6f97187bb6
Fix travis warning about no newline at end of file.
2015-09-10 22:26:33 +12:00
dteviot
573a14993a
Moved isActorNearInactiveCell() logic to own function.
...
Also, triggers when actor is near edge of cell, not when less than 1/2 way to edge.
2015-09-10 21:53:31 +12:00
dteviot
e9c796166a
Added MWMechanics::isPlayerInCombat()
2015-09-10 18:48:34 +12:00
scrawl
cd0f8e556b
Merge pull request #753 from slothlife/thunderstorm-support
...
Improve thunderstorm support.
2015-09-09 14:44:36 +02:00
slothlife
29d74f0249
Improve thunderstorm support.
...
Reversed settings for thunderstorms. Added thunder support to all
weather types. Implemented a simple lightning flash effect similar to
MW.
2015-09-08 22:05:33 -05:00
Marc Zinnschlag
09ec60fe2a
handle missing land texture records properly during merge
2015-09-08 16:01:34 +02:00
Marc Zinnschlag
73f6efddcc
fixed a texture indexing bug (only affects the editor)
2015-09-08 15:33:15 +02:00
Marc Zinnschlag
353d6973e2
Merge remote-tracking branch 'origin/master'
2015-09-08 08:27:00 +02:00
scrawl
b98a076055
Add documentation for ACTN ess-record (activation flags)
2015-09-07 23:27:14 +02:00
scrawl
0442bc98f3
Update sleep interruption formula according to wiki, thanks Hrnchamd
2015-09-07 22:31:11 +02:00
scrawl
5aa33fde43
Include cleanup
2015-09-07 22:16:15 +02:00
scrawl
e5d54fb539
Check for actor being the player in various actions
2015-09-07 22:15:17 +02:00
scrawl
fd48c1d6f4
Make the Equip script function "use" items (drink potion, use alchemy, etc)
2015-09-07 22:09:08 +02:00
scrawl
481f23d955
Implement framerate limit setting
...
The framerate limit can be used to reduce strain on the CPU and GPU, in a way similar to VSync, but without the increased input lag that is typical with VSync.
2015-09-07 16:05:51 +02:00
dteviot
96e3933ee9
Fixed bug in smoothTurn()
...
Now correctly handles changing direction from 178 to -178 degrees.
2015-09-06 17:39:48 +12:00
scrawl
acbea2461b
Fix a typo
2015-09-04 23:27:33 +02:00
scrawl
d11952c48a
Stop rendering when the window is minimized
2015-09-04 03:44:14 +02:00
Marc Zinnschlag
a8dc1c1198
merge land tables
2015-09-03 16:15:00 +02:00
Marc Zinnschlag
85f6bb892b
removed indirection in OpenMW-CS land record
2015-08-31 18:13:27 +02:00
Marc Zinnschlag
69b9eadb52
refactored loading of land data
2015-08-31 16:13:26 +02:00
Marc Zinnschlag
b3fdf92d2b
more const-ness fixes
2015-08-31 16:08:19 +02:00
Marc Zinnschlag
febf611c82
made return type of ESMTerrain::Storage::getLand const
2015-08-31 14:17:11 +02:00
Marc Zinnschlag
69045d7ec9
additional safety check for land texture listing merge stage
2015-08-31 11:10:58 +02:00
Marc Zinnschlag
7a96a04b75
Merge remote-tracking branch 'origin/master'
2015-08-31 09:22:19 +02:00
Marc Zinnschlag
a8bee25757
Merge remote-tracking branch 'dteviot/FixStuckDraft'
2015-08-31 09:18:36 +02:00
Marc Zinnschlag
4b7a034cf9
Merge remote-tracking branch 'slothlife/weather-transition-fix'
2015-08-31 09:03:04 +02:00
scrawl
8aaba0af6f
Fix journal page navigation bug introduced by 7dd09dd637 ( Fixes #2899 )
2015-08-30 17:38:21 +02:00
Marc Zinnschlag
890bbb6b11
merge land texture tables
2015-08-30 14:27:22 +02:00
Marc Zinnschlag
b7983d08ba
fixed merge stage order; added proper initialisation
2015-08-30 11:08:56 +02:00
dteviot
1dfe438a5d
reduce "reset if stuck" AiWander timeout.
...
Now is about 14 seconds, instead of 300.
2015-08-30 16:43:35 +12:00
dteviot
39c2ba8efe
Pathfinding bugfix.
...
Observed at Ebonheart (coe 1, -13). Especially at the western tower. Guards try to walk though tower door.
Cause: buildPath() adds destination (even when unreachable) when only using single node from pathgrid.
2015-08-30 16:12:51 +12:00
dteviot
f2c9b9351f
Try going right and left to "unstick" actor.
2015-08-30 10:06:09 +12:00
dteviot
31d82b6b0c
Unifiy evadeObstacles() logic between AiWander and AiPackage
...
Can't use same code, but logic is now same.
2015-08-30 08:32:47 +12:00
dteviot
f59e918a3b
removed useless code.
...
zTurn ignores turns < 0.0087 radians.
2015-08-29 17:34:33 +12:00
dteviot
0677799839
movement logic in AiPackage uses ObstacleCheck.
2015-08-29 17:21:18 +12:00
slothlife
2b48a20b76
Fix weather transition bugs
2015-08-28 23:12:39 -05:00
slothlife
d9a7986b3a
Remove redundant fast forward check
2015-08-28 18:04:22 -05:00
Marc Zinnschlag
45e7522aa6
Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft'
2015-08-28 16:09:18 +02:00
dteviot
300c48329d
Creature::isFlagBitSet() changed to free function.
2015-08-28 18:38:05 +12:00
slothlife
4fd00a75d5
Merge advanceTime and advanceTimeByFrame
2015-08-27 14:53:52 -05:00
slothlife
cd8ec5c11e
Improve checking for older weather records
2015-08-27 13:44:06 -05:00
slothlife
7817c52cbb
Discard old save game weather records
2015-08-27 09:57:32 -05:00
dteviot
95d2d82abf
extracted isFlagBitSet()
2015-08-27 18:36:46 +12:00
slothlife
c907ed517d
Remove C++11 explicit on conversion operator
2015-08-26 23:34:15 -05:00
slothlife
54fa5273dc
Refactor weather transitions to act more like MW
...
Fixed several issues:
* Waiting/jail time/training all now properly skip remaining transitions
* ChangeWeather no longer permanently sets the region's weather
* ChangeWeather being called during a transition now correctly queues up
another transition
* Corrected transition delta and factor calculations
* ModRegion settings are now saved
2015-08-26 22:59:21 -05:00
Marc Zinnschlag
a97a632aa7
merge references tables
2015-08-26 17:21:24 +02:00
Marc Zinnschlag
a9f9a8d58e
Merge remote-tracking branch 'dteviot/ExtractCommonCreatureDraft'
2015-08-26 15:59:28 +02:00
Marc Zinnschlag
845cafd61c
fixed record state issues after merge
2015-08-25 12:40:40 +02:00
Marc Zinnschlag
f95950e8d8
merge referenceables table
2015-08-25 11:54:16 +02:00
Marc Zinnschlag
9cf793c0b5
silenced a warning
2015-08-25 11:39:43 +02:00
Marc Zinnschlag
40753aa9a3
simplifying merge stage
2015-08-25 08:43:03 +02:00
dteviot
541d7fb4fb
Fixed assorted issues
...
* destructor is virtual
* renamed class to Actor
* corrected indentation of case statement
2015-08-25 18:19:16 +12:00
Marc Zinnschlag
8f7f29943a
Merge remote-tracking branch 'jordan-ayers/topic/dead-code'
2015-08-24 15:13:53 +02:00
Jordan Ayers
cd5bef958f
Remove dead code from alchemywindow.
...
Also align some braces.
2015-08-24 07:43:30 -05:00
dteviot
bb54bbd273
Pulled duplicated functions into common base class
2015-08-24 19:54:02 +12:00
scrawl
b509a18065
Remove code setting PcRace ( Fixes #2886 )
...
This is already handled by the RaceCheck script.
2015-08-23 14:30:23 +02:00
Marc Zinnschlag
16dda281ce
made merge operation more fluent
2015-08-23 13:04:42 +02:00
Marc Zinnschlag
103073150e
added info tables and pathgrid table to merge operation
2015-08-23 12:58:49 +02:00
Marc Zinnschlag
c92898a5bc
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
2015-08-23 12:37:45 +02:00
Marc Zinnschlag
e76401d5ea
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
2015-08-23 12:15:19 +02:00
Marc Zinnschlag
a52b947efe
Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'
2015-08-23 12:11:30 +02:00
Marc Zinnschlag
562f5cdec1
Merge remote-tracking branch 'scrawl/editor_saving'
2015-08-23 12:07:29 +02:00
scrawl
542c648e69
Fix incorrect assignment of PcRace, need to sort race IDs ( Fixes #2884 )
2015-08-22 22:53:06 +02:00
Stanislav Bas
ba4b7df99d
Add missing includes to columnimp.hpp
2015-08-22 16:35:00 +03:00
Stanislav Bas
720aca8f3d
Inform about State change (not a whole row) when modifying a table value
2015-08-22 16:34:57 +03:00
Stanislav Bas
4d24eff859
Show race only when mesh type is Skin (in BodyParts table)
2015-08-22 16:34:54 +03:00
Stanislav Bas
6d81ca07b5
Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()
2015-08-22 16:34:45 +03:00
scrawl
32ad8c86bf
Fix the ESM::LandTexture NAME being discarded on loading
2015-08-22 13:10:54 +02:00
scrawl
031d64d0d3
Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records
2015-08-22 12:57:39 +02:00
Marc Zinnschlag
50ec8b10f5
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-22 10:37:43 +02:00
Stanislav Bas
b7295e2632
Columns with Display_Boolean use Combobox editor even for non-boolean values
2015-08-21 22:36:53 +03:00
Stanislav Bas
aeb1acca51
Remove enum names for AiWanderRepeat column
2015-08-21 22:05:40 +03:00
Stanislav Bas
e14aedc7cd
ModifyCommand uses a proper name of a modified nested value
2015-08-21 21:47:29 +03:00
Stanislav Bas
d038ac2da0
Sort tables by ID in the ascending order initially
2015-08-21 21:38:28 +03:00
scrawl
ba8e4c22aa
Avoid using loops to wrap angle values ( Fixes #2882 )
2015-08-21 20:17:42 +02:00
scrawl
52d8bc555c
Add missing checks to see if spell still exists when loading a savegame (Bug #2883 )
2015-08-21 14:24:49 +02:00
Marc Zinnschlag
3902513e65
merge id collections
2015-08-21 14:02:32 +02:00
dteviot
5dd0ad6841
Fixed rest of travis errors.
2015-08-21 22:41:31 +12:00
dteviot
3fa5c6a0e7
fixed travis build failure
2015-08-21 22:00:08 +12:00
dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb
replaced FLT_MAX with numeric_limits.
2015-08-21 19:34:28 +12:00
scrawl
af3b0cd883
Improve some error messages
2015-08-21 00:31:43 +02:00
dteviot
3b231b85bb
removed incorrect optimization.
...
Now it fixes #2871
2015-08-21 06:55:54 +12:00
Marc Zinnschlag
08325d14ca
Merge remote-tracking branch 'dteviot/Bug2871'
2015-08-20 20:42:35 +02:00
Marc Zinnschlag
d436dc332b
Merge remote-tracking branch 'jeffreyhaines/gametimetracker'
2015-08-20 20:39:44 +02:00
Marc Zinnschlag
5cb0353b5c
Merge remote-tracking branch 'jeffreyhaines/npcsdontscream'
2015-08-20 20:28:36 +02:00
dteviot
c0d3804b4f
Correctly handle disjoint pathgrid ( Fixes #2871 )
...
Bugfix:
When
1. Cell has multiple subgrids (i.e. path grid is disjoint)
2. Distance between destination and pathgrid point 0 is less than distance to points of subgrid closest to start point
Then getClosestReachablePoint() returns pathgrid point 0 as the end point.
This is invalid, this end point cannot be reached from the start point.
2015-08-20 21:50:58 +12:00
dteviot
0ee7407101
extracted common sub-expressions.
2015-08-20 18:17:02 +12:00
dteviot
ff5ef7055e
extracted function CreatureStats::isParalyzed()
2015-08-20 18:12:37 +12:00
Jeffrey Haines
f94d3237fc
Removed unused cmake import
2015-08-19 13:28:01 -04:00
Jeffrey Haines
61bb55aff4
Removed long int parameter
2015-08-19 13:23:40 -04:00
Jeffrey Haines
d91f197119
Time played display setting
2015-08-19 11:31:43 -04:00
