BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
46 Commits 15 Branches 0 Tags
fe263784aea41d41da9f58d0c30d18bc0abc72ba
Commit Graph

46 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ViktorLjung fe263784ae Visual studio crap stuff 2014-04-16 14:46:41 +02:00
ViktorLjung e8aa3bf890 Fixed timestep, forgot header declaration. 2014-04-16 14:40:42 +02:00
ViktorLjung 0338a06836 Fixed timestep. 2014-04-16 14:38:26 +02:00
Jace cf6e16222a Boost and Havok environment variables changed to be version specific 2014-04-16 01:17:37 +02:00
Jace 62abb3f964 Merge branch 'havok' 
Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/RenderSystem.cpp
	src/Systems/RenderSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
 2014-04-16 00:38:30 +02:00
ViktorLjung 1697627f69 Missing libs 2014-04-15 23:34:23 +02:00
Jace 062242ab8e Refactored existing systems to register their own components and resource types. 2014-04-13 17:15:46 +02:00
Jace e4e5068727 Resource manager refactoring 2014-04-13 03:42:12 +02:00
ViktorLjung 84484b3703 Box and Sphere Rigidbodies working 2014-04-13 02:20:50 +02:00
Jace 14feb3659b Initial work for pre-caching resources in render system 2014-04-13 01:25:21 +02:00
Jace 04cb1f1204 Created resource manager 2014-04-13 00:20:51 +02:00
ViktorLjung f6090679b7 Havok includes and libs working, ready for implementation. 2014-04-12 23:53:14 +02:00
ViktorLjung 41db395f61 Still trying to get it working. 2014-04-12 20:53:35 +02:00
Jace d13c19d654 Removed unused components 2014-04-12 18:36:06 +02:00
Jace 1bd914991a Revamped project layout 2014-04-12 18:31:03 +02:00
ViktorLjung 04fff4a27b Changed toolset to vs11, for future Havok implementation. 2014-04-12 01:59:55 +02:00
Jace 3470a80f40 Revert "Indentation style changed to Horstmann" 
This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
 2014-04-12 01:48:15 +02:00
ViktorLjung d7e65ff118 Vehicle kind of working. 2014-04-12 00:36:37 +02:00
Jace f2259f712d Indentation style changed to Horstmann 2014-04-11 21:53:05 +02:00
Jace e70e18a27b Fixed library exception in gitignore 2014-04-11 21:06:35 +02:00
Jace 4c081d0e1c Indentation style changed to Allman 
Using Artistic Style (http://astyle.sourceforge.net/)
Options:
--style=allman
--indent=tab
--keep-one-line-blocks
--align-pointer=type
--align-reference=name
 2014-04-11 20:59:42 +02:00
Jace 34bcfbce08 UML: Added World structure 2014-04-11 20:21:17 +02:00
Jace d7fa9eb70f Sound! 2014-04-10 07:39:44 +02:00
Jace 6addc391b5 WIP UML 2014-04-10 01:19:22 +02:00
Jace 28c7ab4b3e WIP Collision meshes 2014-04-07 23:36:06 +02:00
ViktorLjung 4a6f0cad32 Constraints working, I think... :D 2014-04-07 00:09:09 +02:00
Jace 0896f540fe Crude texture caching 2014-04-06 21:25:05 +02:00
Jace 412d53a1f7 Physics constraint components 2014-04-06 20:55:54 +02:00
ViktorLjung a880e7f3e6 CompoundShape works, i.e parent child physics :) 
Center of mass is still bugged.
 2014-04-06 19:00:58 +02:00
ViktorLjung 1d0747076f Physics!!!!!1111oneoneonetwo 2014-04-06 03:39:50 +02:00
ViktorLjung d6fc82c91e Spelling Tobias :3 2014-04-06 03:39:27 +02:00
Stiffly b4c8d8ca19 Added physics components. 2014:04:05 02:57. 2014-04-05 21:20:50 +02:00
Jace e2d8235169 Broken shadow map. 2014-04-05 21:20:50 +02:00
Jace a774d0ca07 Some terrain and invisible lights... 2014-04-05 21:20:50 +02:00
Jace ad2862bf84 A gray tank! :D 2014-04-05 21:20:49 +02:00
Jace ed29297d00 Missing libs. 2014-04-05 21:20:49 +02:00
Jace a7985b1686 Adapted Escape the Dawn engine. 2014-04-05 21:20:48 +02:00
Jace 6a64de37fb SOIL for prototype ONLY. 2014-04-05 21:20:48 +02:00
Jace 014ae5f7a8 UpperCamelCase GodDamnIt! 2014-04-05 21:10:59 +02:00
Jace 333f652867 Now using BitTorrent sync for asset management. 2014-04-05 21:07:46 +02:00
Jace 2563044047 Updated gitignore. Run "git update-index --skip-worktree deploy.bat" if using custom path to asset folder. 2014-04-04 23:21:47 +02:00
Jace 36b6a55297 Deploy script assuming upper camel case folder names. 2014-04-04 21:07:26 +02:00
Jace fbb6344fdb Deploy script now also deploying shaders and textures. 2014-04-04 20:32:14 +02:00
Jace 1c50b976b5 Bullet recompiled as Multithreaded Debug DLL 2014-04-04 00:00:18 +02:00
Jace 515b08fea2 Bullet 2.82 2014-04-03 21:37:59 +02:00
Jace 700f060aaf Initial bootstrap 2014-04-02 18:12:08 +02:00