Marc Zinnschlag
904ad94952
added merge operation (doesn't do anything yet)
2015-08-13 12:03:20 +02:00
Marc Zinnschlag
d511772534
Merge remote-tracking branch 'rohit-n/gamepad'
2015-08-13 10:15:27 +02:00
Marc Zinnschlag
86dac4a698
Merge remote-tracking branch 'dteviot/AiCombatRefactor'
2015-08-13 10:14:18 +02:00
cc9cii
2242920b85
Fix compiling with MSVC 2013 (typo mistake with the include file).
2015-08-13 13:11:17 +10:00
cc9cii
bb250a236b
Fix compilation when using 1.9 Ogre branch (i.e. the previous change on this file was in fact not related to MSVC 2015, but rather the use of the Ogre default branch).
2015-08-13 13:09:40 +10:00
Rohit Nirmal
d9b11f963a
Gamepad: Slow down simulated mouse with right trigger
...
in menus.
2015-08-11 21:46:54 -05:00
cc9cii
b920e1bde7
Support MSVC 2015. Tested(*) with updated dependencies:
...
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763
(*) only tested compilation and startup of the each app
2015-08-12 06:50:22 +10:00
Marc Zinnschlag
7f398f8790
Merge remote-tracking branch 'corristo/osx-packaging-nextgen'
2015-08-11 11:49:20 +02:00
Nikolay Kasyanov
34d601360f
OS X: setup OSG plugins packaging
2015-08-10 23:15:32 +02:00
Nikolay Kasyanov
2ded28f6aa
OS X: reintroduce packaging code
...
It's much simpler now thanks to bundle utilities with @rpath support.
2015-08-10 23:15:32 +02:00
Nikolay Kasyanov
c868010c20
OS X: don't consider libs from /usr/local as "system dependencies" during packaging
...
Otherwise they won't be moved into final application bundle.
2015-08-10 23:15:31 +02:00
Nikolay Kasyanov
5fba7400a6
Borrow modified bundle utilities from https://github.com/Slicer/Slicer
...
They support dependencies with @rpath
2015-08-10 23:15:31 +02:00
dteviot
55e3aaaa35
made variable const.
2015-08-10 20:30:43 +12:00
dteviot
e42a2478dc
Removed tests that are not necessary.
2015-08-09 17:58:40 +12:00
dteviot
2b9e22f593
extracted function stopAttack().
2015-08-09 14:29:38 +12:00
dteviot
0884a3796f
extracted function isTargetMagicallyHidden().
2015-08-09 14:20:55 +12:00
dteviot
038851420d
Removed unneeded temp variables.
...
Corrected case of function names.
2015-08-09 14:18:55 +12:00
dteviot
50ddcd1953
more attack logic moved into AiCombatStorage.
2015-08-09 14:10:08 +12:00
dteviot
0735e3e06e
move start attack logic to AiCombatStorage.
...
Basically, copied from mrchenko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:08:42 +12:00
dteviot
1676bf917e
CombatMove logic moved into AiCombatStorage.
...
Basically, copied from mrcheko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
2015-08-09 14:06:52 +12:00
Marc Zinnschlag
708cacdec4
disable merge menu item when a merge is already in progress
2015-08-08 16:47:58 +02:00
Marc Zinnschlag
3046795a9c
updated credits file
2015-08-08 11:01:08 +02:00
Marc Zinnschlag
23ccee0124
Merge remote-tracking branch 'dieho/master'
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-08-08 11:00:44 +02:00
Marc Zinnschlag
7f10a7f24f
Merge remote-tracking branch 'smbas/feature-mgef-verifier'
2015-08-08 10:50:38 +02:00
Marc Zinnschlag
d29862eac3
Merge remote-tracking branch 'emperorarthur/anim_fail'
2015-08-08 10:47:46 +02:00
Marc Zinnschlag
be6a85c7aa
Merge remote-tracking branch 'emperorarthur/nif_tester_updates'
2015-08-08 10:47:12 +02:00
Marc Zinnschlag
b74a14211f
Merge remote-tracking branch 'origin/master'
2015-08-08 10:42:02 +02:00
Marc Zinnschlag
1eed1c4d23
Merge remote-tracking branch 'dteviot/AiCombatPerFrameUpdate'
2015-08-08 10:35:58 +02:00
Arthur Moore
20078c41c3
Removed now unneeded script
2015-08-07 20:53:43 -04:00
Arthur Moore
c7b97ee9ba
Cleaned up niftest's output
...
A bad file inside of a bsa archive now looks like:
<game dir>/Data Files/TR_Data.bsa/meshes/tr/x/tr_act_ind_mark_alm.nif
2015-08-07 20:52:34 -04:00
Arthur Moore
3d78ee0c2b
niftest now scans BSA files in directories for nif errors
...
The program is explicit so the user knows exactly where the bad file is.
2015-08-07 20:52:25 -04:00
Arthur Moore
6a6da42b85
Updated niftest's help message
2015-08-07 20:52:04 -04:00
Arthur Moore
efadce3e90
Have niftest handle directories as well
...
Note: BSA files within the directory must be passed manually.
2015-08-07 20:51:44 -04:00
Arthur Moore
865491d101
Added a help message to niftest
...
Now using the boost argument parser.
2015-08-07 20:51:25 -04:00
scrawl
56b7196bea
Remove incorrect implementation of "Clouds Maximum Percent" weather setting
2015-08-07 15:34:01 +02:00
scrawl
52dbb24bb9
Merge pull request #708 from slothlife/sky-render-fixes
...
Fix several sky rendering bugs, maybe also #639
2015-08-07 12:47:51 +02:00
slothlife
3235cecddf
Use Glare View for visibility of celestial bodies
...
Fixed memory leak from Sun and Moon objects by pulling Updaters back out
into separate objects. Removed code related to
mCelestialBodyTransparency.
2015-08-07 00:08:18 -05:00
Stanislav Bas
ff2dab8d56
Remove check for an empty Particle from Magic effects verifier
2015-08-06 14:17:42 +03:00
Marc Zinnschlag
4fd3097c1c
improved adjuster widget problem reporting
2015-08-06 12:58:52 +02:00
Marc Zinnschlag
b83f9445a9
added UI for merge tool (merge tool itself is still missing)
2015-08-06 12:52:10 +02:00
Marc Zinnschlag
469a896ca1
make non-editable fields in dialogue sub view selectable ( Fixes #2818 )
2015-08-06 08:45:38 +02:00
Marc Zinnschlag
f06c4c1e18
Merge remote-tracking branch 'origin/master'
2015-08-06 08:25:49 +02:00
Marc Zinnschlag
8dc5b8aa92
Merge remote-tracking branch 'ace/patch-1'
2015-08-06 08:25:03 +02:00
slothlife
238ae419a3
Fix use of incorrect material for Sun
2015-08-05 22:02:54 -05:00
slothlife
f2e51b0579
Use diffuse alpha to fade Sun
2015-08-05 21:03:21 -05:00
scrawl
5602cd9b7b
Fix the launcher's version label for builds with no git commit info
2015-08-06 02:54:47 +02:00
Marc Zinnschlag
cbf9f83b85
allow use of IDs as function arguments, even if the ID matches a keyword ( Fixes #2830 )
2015-08-05 17:20:01 +02:00
Alexander "Ace" Olofsson
46ce04a65b
Don't package duplicate version for Windows
...
The real version file is in the resources folder, and that's where it's read from. So the extra file is unused, and redundant.
2015-08-05 17:10:35 +02:00
slothlife
ea2f88a355
Fix several sky rendering bugs, maybe also #639
...
Added code to hide the moons, sun, and stars for certain weather
effects. Lightly refactored CelestialBody and derived classes. Fixed
moons switching phase at 24:00.
2015-08-04 21:07:42 -05:00
Alexandre Moine
8c8c5328dc
Rewrite of the description
2015-08-04 22:50:53 +02:00
