Marc Zinnschlag
9ab25dbf6b
Merge remote-tracking branch 'dteviot/Rng'
2015-03-21 09:00:55 +01:00
dteviot
2cfc4c0286
script Random() command now returns correct range.
2015-03-21 18:21:01 +13:00
scrawl
71782462b7
Subclass ParticleSystem to support limit on the number of particles
2015-03-21 04:36:36 +01:00
scrawl
2e11642273
Fix BillboardNode overriding scale
2015-03-21 04:10:50 +01:00
scrawl
a9aee389c0
Emitters attached to correct node, a bit ugly
2015-03-21 03:50:50 +01:00
scrawl
32bb202290
Implement BillboardNode
2015-03-20 23:14:01 +01:00
scrawl
d486cde330
Fix broken VisControllers
2015-03-20 21:32:26 +01:00
scrawl
4957ceeb1d
Refactor controllers, now part of the scene graph as UpdateCallbacks
...
Practical benefits:
- The controller update is now run automatically
- Creating an instance of a scene graph should now work properly using the defined copy constructors
2015-03-20 19:51:54 +01:00
scrawl
af27a10b0c
OpenCS: preliminary port of PreviewWidget to OSG
2015-03-20 16:22:33 +01:00
scrawl
40fc097722
OpenCS: use the new VFS, restored resource tables
2015-03-20 16:22:33 +01:00
Marc Zinnschlag
5198a173fa
Merge remote-tracking branch 'corristo/osx-user-data-path'
2015-03-19 18:50:05 +01:00
scrawl
49c2da27b3
OpenCS compiles and runs again (no rendering)
2015-03-19 17:21:15 +01:00
scrawl
ab3c28eb96
Use template function for interpolation
2015-03-19 17:00:16 +01:00
scrawl
00ab474188
More work on copy constructors
2015-03-19 16:22:01 +01:00
scrawl
7bc0d41bb0
Marker collision fix ( Fixes #2461 )
2015-03-19 15:51:45 +01:00
scrawl
f8422c3ed4
Particles mostly completed, still need to attach emitters to the correct node and handle NiBSPArrayController
2015-03-19 03:01:11 +01:00
scrawl
79c2138e53
Port ResourceHelpers to new VFS
2015-03-19 01:45:01 +01:00
Nikolay Kasyanov
af2b08214b
#2460 : use Application Support as user data path on OS X
2015-03-18 23:48:03 +02:00
Nikolay Kasyanov
3e45e9a48a
Remove no longer required strnlen wrapper
...
It was used for MinGW & OS X < 10.7. Minimal OS X version was bumped to
10.7 and MinGW support was recently dropped (see
1eaa64c49caeb753facf36c5173d5236c1f969e0).
2015-03-18 23:37:54 +02:00
Marc Zinnschlag
47bac13749
Merge remote-tracking branch 'scrawl/master'
2015-03-18 12:07:40 +01:00
scrawl
f843e12538
Add world space particle systems, will need more changes when emitters are added
2015-03-17 22:34:30 +01:00
scrawl
510375aa63
Add virtual file system (VFS) replacing the low level parts of the old resource system
2015-03-17 22:02:56 +01:00
Marc Zinnschlag
c032113247
Merge remote-tracking branch 'sandstranger/release-jni-memory'
2015-03-17 11:41:41 +01:00
scrawl
f7ecda68c9
Fix for unicode filenames in ContentModel ( Fixes #2451 )
2015-03-16 15:34:00 +01:00
sylar
db10c87b89
release jni memory
2015-03-16 18:21:38 +04:00
Nathan Aclander
48e2ec2840
Fix comparison of integers of different signs
...
Clang reported comparison of unsigned long with long. This cast should fix it.
2015-03-15 16:20:17 -07:00
Marc Zinnschlag
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
2015-03-15 22:04:26 +01:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
2015-03-15 08:49:03 +13:00
dteviot
2ef7fc4e2c
Installer work for Windows ( Fixes #1621 )
...
1. Correctly reads Windows registry for vanilla MW install location.
2. Populates existing installation page with location of vanilla, when found.
3. On Windows, installer wizard now gets to Import page.
2015-03-15 08:08:55 +13:00
cc9cii
488bc76da5
Fix saving land data.
2015-03-13 22:06:55 +11:00
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
2015-03-12 10:29:39 +01:00
scrawl
5f051b5bf2
Remove comment about GMST cleaning which was removed.
2015-03-12 00:32:57 +01:00
scrawl
16ddfbca14
Remove some outdated todo comments
2015-03-12 00:27:01 +01:00
scrawl
304277429f
Rename variable to not show up in search for "TODO" comments.
2015-03-12 00:21:46 +01:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01:00
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
2015-03-07 18:34:29 +01:00
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
2015-03-07 11:04:54 +13:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
dteviot
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
2015-03-06 21:36:42 +13:00
cc9cii
d28f257ada
Fix for bug #2428 . Set default flag value (mandatory) for containers.
2015-03-06 11:53:46 +11:00
dteviot
80fe24207c
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-05 20:21:22 +13:00
Marc Zinnschlag
4e1c086d6a
load start up script records
2015-03-03 14:31:59 +01:00
Marc Zinnschlag
bf92d5cde9
removed redundant mScript field in ESM::StartScript
2015-03-03 13:04:57 +01:00
scrawl
a8cb4e807b
Warning fix
2015-03-03 11:24:23 +01:00
scrawl
17e3069896
Minor efficiency fix
2015-03-02 22:33:37 +01:00