Marc Bouvier
2e8b0cf502
Remove Directory Paths in Qt Classes Includes
...
Qt recommends that the path location not be used when including a class.
Also, this is how other files include Qt classes in the OpenCS app. This
change is for consistency only.
2013-08-21 17:14:29 -05:00
Nikolay Kasyanov
dc6e15f38e
Replaced std::pow with shift since clang doesn't like int as a first argument
...
(reports that call is ambiguous)
2013-08-21 23:59:33 +04:00
Marc Zinnschlag
e03e2f0817
Merge remote-tracking branch 'scrawl/master'
2013-08-21 19:50:08 +02:00
scrawl
d086346b07
Fix loading of some cells in TR
2013-08-21 17:26:11 +02:00
scrawl
758d989a03
If multiple plugins have land data for the same cell, the last plugin should win
2013-08-21 17:26:11 +02:00
scrawl
5f7e6f7b10
Fix a material issue, layers per pass wasn't entirely correct
2013-08-21 17:26:11 +02:00
scrawl
43313437dc
Fix composite map for cells without land data
2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2
Use a proper node hierarchy; disconnect the root when entering interior
2013-08-21 17:26:11 +02:00
Chris Robinson
c855ab65cf
Non-colliding objects are considered flying
2013-08-21 07:24:54 -07:00
Chris Robinson
602be9bbe7
Avoid swimming into the air from underwater
2013-08-21 07:24:54 -07:00
Chris Robinson
9f09bb6f6f
Use separate inputs for swimming and flying
2013-08-21 07:24:54 -07:00
Chris Robinson
a546ace94d
Remove an unused method
2013-08-21 07:24:54 -07:00
vorenon
3bf3bd4b8c
Silenced some warnings
2013-08-21 13:53:49 +02:00
Chris Robinson
1a9672e31b
Don't update player physics more than 60 times a second
...
Bullet and/or our collision handling code doesn't like timesteps much
smaller than that. Ideally we should do physics in 60fps (or even 30fps)
steps and use prediction and interpolation to get more, but that's not
straight forward and needs a fixed timestep loop to lock physics and
logic together.
2013-08-20 11:31:49 -07:00
graffy76
e6fdc7e7fd
...
2013-08-20 12:34:39 -05:00
Marc Zinnschlag
a61215dab1
some general filter parser cleanup
2013-08-20 16:04:06 +02:00
graffy76
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
2013-08-20 08:16:56 -05:00
Chris Robinson
0e56b2facb
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 04:42:28 -07:00
Chris Robinson
d9040df9d6
Increase the max number of physics iterations
...
Should help with highly tessellated collision meshes with high
framerates.
2013-08-20 04:41:52 -07:00
scrawl
ecf7786d11
terrain_num_lights was removed
2013-08-20 12:31:47 +02:00
scrawl
fa76d1631b
Some terrain fixes
2013-08-20 12:08:46 +02:00
scrawl
0545622f5a
Fix werewolf state not getting completely reset when starting a new game
2013-08-20 11:24:19 +02:00
Chris Robinson
a993af53e7
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 02:21:44 -07:00
Chris Robinson
a17997a973
Continually add bits of input velocity to inertia when falling
2013-08-20 02:10:18 -07:00
Marc Zinnschlag
0c8f85f17d
Merge remote-tracking branch 'wheybags/master'
2013-08-20 11:05:50 +02:00
graffy76
24e38846da
Fixed broken profile actions
2013-08-20 03:53:23 -05:00
graffy76
b52645bf2a
Fixes to accommodate master/plugin loading
2013-08-20 03:23:32 -05:00
scrawl
8c8653160d
Crash fix, material fix
2013-08-20 09:52:27 +02:00
Tom Mason
7f0f9037be
fix for older versions of unshield
2013-08-19 22:57:21 +01:00
scrawl
13afcc9324
Don't link to OgreTerrain
2013-08-19 22:22:14 +02:00
Tom Mason
8d232aca35
changed libunshield filename to satisfy travis
2013-08-19 20:48:20 +01:00
Tom Mason
603ce41054
added libunshield to travis
2013-08-19 20:32:19 +01:00
Tom Mason
06ff40eda7
only use unshield on not windows
2013-08-19 20:20:08 +01:00
Tom Mason
865a7c63df
cmake for system libunshield
2013-08-19 20:20:00 +01:00
Tom Mason
d3748cd5bb
Install uncompressed data files from cd
2013-08-19 20:19:53 +01:00
Tom Mason
9d1daf7dc2
enum was unnecessary
2013-08-19 20:19:47 +01:00
Tom Mason
641b7b0336
anonymous namespace
2013-08-19 20:19:41 +01:00
Tom Mason
454b64974d
filenames
2013-08-19 20:19:35 +01:00
Tom Mason
3264b5974e
fix invalid syntax
2013-08-19 20:19:25 +01:00
Tom Mason
90a892d304
unshield fixes
2013-08-19 20:19:11 +01:00
Tom Mason
ceb3317807
Integrate unshield with launcher
2013-08-19 20:19:01 +01:00
scrawl
b92da9ae93
Neighbour fix
2013-08-19 21:08:44 +02:00
scrawl
14e4b985ad
Merge branch 'master' of git://github.com/zinnschlag/openmw into terrain2
2013-08-19 20:43:29 +02:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
Chris Robinson
d727b15580
Fix tracing down
2013-08-19 20:39:37 +02:00
Chris Robinson
394fc75697
Clean up the trace struct
2013-08-19 20:39:37 +02:00
Chris Robinson
b351109649
Get rid of the old newtrace method
2013-08-19 20:39:37 +02:00
Chris Robinson
14acacf401
Use a better method to do actor physics traces
2013-08-19 20:39:37 +02:00
Chris Robinson
76b812f75f
Improve actor movement collision handling
2013-08-19 20:39:37 +02:00
eroen
8d925b7fd6
cleanup
...
- drop trailing slashes from paths for consistency
- sort entries that got unsorted
2013-08-19 20:39:37 +02:00