Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-24 13:45:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56 commits 28 branches 28 tags 1.2 GiB
Commit graph

56 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yoz Grahame
4ebcc0cff3 Look at all the pretty colours! 
We now have color values for the field elements, which are gradually added to the particles as they move.
 2012-11-26 18:17:00 -08:00
Yoz Grahame
410e7b2d7e Commented out cubes, added particle count, misc cleanup 2012-11-26 14:47:30 -08:00
Yoz Grahame
268bc88ed3 Merge branch 'master' of git://github.com/worklist/interface 
Conflicts:
	main.cpp
 2012-11-26 14:17:32 -08:00
Philip Rosedale
e5c94d6c69 Added test routine makecubes() and key handlers 2012-11-25 15:32:55 -08:00
Philip Rosedale
4226886042 Added vector renderer util, broadcast packets now reaching agents 2012-11-21 12:08:30 -08:00
Philip Rosedale
2cf25c23c5 Spaceserver agent list, broadcast routines for discovered agents 2012-11-21 11:12:40 -08:00
Philip Rosedale
e64f46d556 Added spaceserver messaging. 2012-11-20 21:51:09 -08:00
Philip Rosedale
c91dd5c4c2 More little housekeeping cleanups to main.cpp 2012-11-19 15:20:24 -08:00
Philip Rosedale
6a7128243a Removed cloud rendering from main.cpp to Cloud class 2012-11-19 15:07:21 -08:00
Yoz Grahame
ea66f0c2a8 use glDrawElements() to draw the particles - no major speedup so far, but less code 2012-11-19 13:18:37 -08:00
Yoz Grahame
5a522feb32 Merge branch 'master' of git://github.com/worklist/interface 
Conflicts:
	main.cpp
 2012-11-19 12:56:38 -08:00
Philip Rosedale
95b106b867 Removing some of the triangle code in main.cpp 2012-11-18 11:00:21 -08:00
Philip Rosedale
125eed350a Further work on Cloud class 2012-11-18 10:45:41 -08:00
Philip Rosedale
eb648d3d1f Partial commit to switch sprite rendering to new Cloud class 2012-11-17 17:00:56 -08:00
Philip Rosedale
13344f1774 Head tweaks, audio toggle 2012-11-16 16:45:44 -08:00
Yoz Grahame
1f6134b14b Lock build SDK to 10.7 2012-11-12 17:48:45 -08:00
Yoz Grahame
c604a88a07 Texture loading only happens at init() 2012-11-12 17:48:28 -08:00
Philip Rosedale
ee1db09d06 Merge branch 'master' of github.com:/worklist/interface 2012-11-12 17:32:42 -08:00
Philip Rosedale
7dbac3fbc9 Work in progress on field/ball interaction 2012-11-12 17:31:07 -08:00
Yoz Grahame
8509cd421e Merge pull request #5 from yozlet/master 
Fix missing textures
 2012-11-12 17:29:09 -08:00
Yoz Grahame
0206086ade Oops - texture load command went missing in a merge 2012-11-12 17:27:39 -08:00
Philip Rosedale
642c81beae Trivial change to test 2012-11-09 18:02:39 -08:00
Yoz Grahame
190bc258b4 Merge pull request #4 from yozlet/master 
Merging 2d pointer fix
 2012-11-09 15:55:00 -08:00
Yoz Grahame
4d94e9e322 Merge branch '18637' 
Conflicts:
	main.cpp
 2012-11-09 15:53:42 -08:00
Yoz Grahame
c2c7f25a53 Documented load_png_as_texture() 2012-11-09 15:50:28 -08:00
Philip Rosedale
250400dac1 field modifies itself by particles 2012-11-09 15:44:45 -08:00
Yoz Grahame
6e62e9ee32 Fixed 2D pointer particle display 2012-11-09 15:41:19 -08:00
Philip Rosedale
20845b4704 Added textures again 2012-11-07 15:16:16 -08:00
Philip Rosedale
acd7689cab Added textures 2012-11-07 15:12:59 -08:00
Philip Rosedale
eb69451c9b Default with less stuff showing, code cleanup. 2012-11-07 14:49:28 -08:00
Yoz Grahame
9142f8c876 Updated .gitignore 2012-11-07 14:09:53 -08:00
Philip Rosedale
fd09a94db0 Testing Grayson texture 2012-11-07 12:53:29 -08:00
Yoz Grahame
255f9e73d3 Removed width & height args from load_png_as_texture() 2012-11-07 12:48:51 -08:00
Yoz Grahame
2d6a2922a7 Twiddle the twiddles 2012-11-07 12:34:58 -08:00
Philip Rosedale
73c4e55da4 Fixing merge conflicts 2012-11-07 10:48:24 -08:00
Philip Rosedale
39c4c729e4 tweak audio compression to 22050 2012-11-07 09:51:05 -08:00
Yoz Grahame
ee1113a017 Bug fix 2012-11-06 18:47:19 -08:00
Yoz Grahame
e6ef767152 Uses point sprites, Grayson's texture, and 100,000 particles 2012-11-06 17:59:20 -08:00
Yoz Grahame
65bba76f5f Ignoring .DS_Store files 2012-11-06 15:35:32 -08:00
Yoz Grahame
2a9d1701cb Added sphere.png 2012-11-06 15:35:17 -08:00
Yoz Grahame
6cdba406e1 Now loads PNGs as textures (test texture load in the corner) 2012-11-05 16:52:45 -08:00
Philip Rosedale
cabcbbc0d2 Latest work 2012-11-02 16:49:08 -07:00
Philip Rosedale
181a0b8afc New Hardware RET6 code for more channels, added particle elements, physics. 2012-10-21 21:11:52 -07:00
Philip Rosedale
43251deb9f Added adjustable test latency buffer, stroked characters, code cleanup. 2012-10-15 00:48:25 -07:00
Philip Rosedale
8b90a5d40c Added hand code to display/move a manipulator arm 2012-10-14 15:07:31 -07:00
Philip Rosedale
9507824986 Fixed bug with hang on serial turned off and no device. 2012-10-13 12:09:43 -07:00
Philip Rosedale
df2347d8e9 Merge branch 'master' of github.com:worklist/interface 2012-10-13 11:35:26 -07:00
Philip Rosedale
98cb1d634e Added large model of head, and networking code. 2012-10-13 10:46:15 -07:00
Philip Rosedale
fe94473b6c Added class files for rendering head 2012-09-11 09:07:28 -07:00
Andrew Meadows
610948cc18 Merge branch 'master' of https://github.com/worklist/interface 2012-09-09 08:15:21 -07:00