Marc Zinnschlag
c447ea073c
Merge branch 'cmakefix' into next
2012-02-03 10:31:16 +01:00
Cris Mihalache
4bc7051741
Finished refactoring, brought CharacterCreation up to standards
2012-02-02 18:31:28 +02:00
Nikolay Kasyanov
472d88e2c5
Feature #162 - Need to create app bundle using CMake, not by hand WIP
2012-02-01 20:48:13 +04:00
Pieter van der Kloet
c255c519e4
Replaced FindOGRE.cmake, this one looks for debug libraries too
2012-01-31 21:10:40 +01:00
Cris Mihalache
ed5892eb5c
Finished moving the bulk of character creation code
2012-01-30 21:53:17 +02:00
Cris Mihalache
d17ba6ce19
Forgot the CharacterCreation files
2012-01-30 19:27:49 +02:00
Cris Mihalache
4b758376be
Created a class for char gen, and starting moving code to it
2012-01-30 16:38:43 +02:00
Marc Zinnschlag
78b6ceabc7
Merge branch 'refdata' into equipment
2012-01-30 12:38:55 +01:00
Marc Zinnschlag
e19cea3e7b
Merge branch 'refdata' into next
2012-01-30 12:38:35 +01:00
Marc Zinnschlag
a4785ffc4f
minor fix
2012-01-30 12:38:13 +01:00
Jason Hooks
2d0e83a2cf
Reversing changes
2012-01-30 00:06:29 -05:00
Jason Hooks
d2b3c1dbac
Collision may be working correctly
2012-01-29 18:13:43 -05:00
Jason Hooks
9c73fa6b6d
Physics sort of fixed
2012-01-29 17:50:51 -05:00
Alexander "Ace" Olofsson
72c4f75212
Only install redist if it exists
2012-01-29 23:12:40 +01:00
Alexander "Ace" Olofsson
4fe31fbd61
Simple windows packaging with CPack (NSIS)
2012-01-29 23:08:02 +01:00
Nikolay Kasyanov
705b2955a0
Feature #162 - Need to create app bundle using CMake, not by hand.
...
In progress, working towards plugins support.
2012-01-30 00:28:02 +04:00
Nikolay Kasyanov
a301fc355e
Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)
2012-01-29 23:41:27 +04:00
Nikolay Kasyanov
cb95c82af2
Merge remote-tracking branch 'upstream/master'
2012-01-29 23:39:36 +04:00
Marc Zinnschlag
5a70f28f47
removed a warning
2012-01-29 20:29:02 +01:00
Lukasz Gromanowski
b004e2479c
Issue #133 Handle resources across multiple data directories - WIP
...
Work In Progress - added support for multiple paths in SoundManager.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-29 20:27:03 +01:00
Marc Zinnschlag
81d0d58346
Merge remote branch 'mirc/master' into openengine
2012-01-29 20:25:11 +01:00
Cris Mihalache
daa8fb15ce
Removed all physics-related code from Engine
2012-01-29 20:51:20 +02:00
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
2012-01-29 17:31:18 +02:00
Jason Hooks
1da519a914
Some cleanup
2012-01-29 00:42:55 -05:00
Marc Zinnschlag
61dd1922b0
more specific cmake source file GLOBing
2012-01-28 14:16:25 +01:00
Lukasz Gromanowski
86f88bedae
Issue #168 - Configuration cleanup
...
Removed 'data' part from token names, added token cleaning when
invalid or unknown token is passed as commandline parameter.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-28 11:59:08 +01:00
Marc Zinnschlag
0d7f39fcb5
Merge branch 'refdata' into next
2012-01-28 11:46:34 +01:00
Marc Zinnschlag
f2972b1ca0
turned ContainerStore from a template into a simple struct
2012-01-28 11:45:55 +01:00
Lukasz Gromanowski
c5dee2c4fb
Issue #168 - Configuration cleanup
...
Corrected tokens processing. If directory exist then tokens
shall be replaced by correct path, otherwise they are silently
removed from path container.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-28 09:49:09 +01:00
Marc Zinnschlag
a17c193f56
Merge remote branch 'pvdk/cmake' into cmake
2012-01-28 09:47:38 +01:00
Pieter van der Kloet
ea241d85ef
Fixed some issues with the CMake files
2012-01-28 01:36:17 +01:00
Marc Zinnschlag
8de6761a79
general cleanup
2012-01-27 15:11:02 +01:00
Marc Zinnschlag
c081160591
replaced container store in ref data with new custom data implementation
2012-01-27 14:55:58 +01:00
Marc Zinnschlag
b0256cea34
replaced movement settings in ref data with new custom data implementation
2012-01-27 13:17:30 +01:00
Marc Zinnschlag
aa87bd4030
replaced creature stats in ref data with new custom data implementation
2012-01-26 11:35:47 +01:00
Lukasz Gromanowski
f4b6caac59
Revert "Issue #178 - workaround for compilation problems with ogre 1.8.0."
...
This reverts commit 37e272b3b5
2012-01-26 00:14:03 +01:00
Lukasz Gromanowski
1d96b99532
Issue #168 - Configuration cleanup
...
Added tokens processing, modified getInstallPath for linux
so we could use ~/.wine/dosdevices symlinks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-01-25 23:55:43 +01:00
Marc Zinnschlag
c6761e3470
replaced NPC stats in ref data with new custom data implementation
2012-01-25 16:56:49 +01:00
Marc Zinnschlag
6ada405af0
removing last bits of old D code
2012-01-25 16:08:55 +01:00
Jason Hooks
6de0847b86
Slightly better performance on animation
2012-01-25 01:21:30 -05:00
Nikolay Kasyanov
ec6243dd77
fixed compilation problem with llvm clang: constant type explicitly set to float
2012-01-24 16:01:29 +04:00
Marc Zinnschlag
baf9cff21d
added customdata base class (issue #185 )
2012-01-24 11:24:05 +01:00
Marc Zinnschlag
f14dc90b34
Merge branch 'animationfix'
2012-01-24 10:46:15 +01:00
Marc Zinnschlag
4b6cd582a7
removed some redundant (and misplaced) functions
2012-01-24 10:45:40 +01:00
Marc Zinnschlag
258ab0218a
submodule update (issue #131 )
2012-01-23 23:32:00 +01:00
Marc Zinnschlag
6c7e5d00e4
Merge remote branch 'gus/master' into activation
2012-01-23 23:28:18 +01:00
gugus
6c15aec5e4
added some comments
2012-01-23 22:16:08 +01:00
gugus
0a55fe0219
Fixed NPC activation. Might require some more work when NPC physic will be used.
...
Note: some NPC seems to be smaller than other, but for now, the capsule shae size is the same for every NPC
2012-01-23 21:49:51 +01:00
Marc Zinnschlag
26c328e73f
added some more comments to avoid further confusion
2012-01-23 14:55:00 +01:00
Marc Zinnschlag
16bc374921
animation updates were hooked up to the wrong update function
2012-01-23 14:33:06 +01:00
