Yoz Grahame
|
8d47a75758
|
Commented out cubes, added particle count, misc cleanup
|
2012-11-26 14:47:30 -08:00 |
|
Yoz Grahame
|
410e7b2d7e
|
Commented out cubes, added particle count, misc cleanup
|
2012-11-26 14:47:30 -08:00 |
|
Yoz Grahame
|
20ae9e0f11
|
Merge branch 'master' of git://github.com/worklist/interface
Conflicts:
main.cpp
|
2012-11-26 14:17:32 -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
|
6172b38f49
|
Added test routine makecubes() and key handlers
|
2012-11-25 15:32:55 -08:00 |
|
Philip Rosedale
|
e5c94d6c69
|
Added test routine makecubes() and key handlers
|
2012-11-25 15:32:55 -08:00 |
|
Philip Rosedale
|
2b62adce6c
|
Added vector renderer util, broadcast packets now reaching agents
|
2012-11-21 12:08:30 -08:00 |
|
Philip Rosedale
|
4226886042
|
Added vector renderer util, broadcast packets now reaching agents
|
2012-11-21 12:08:30 -08:00 |
|
Philip Rosedale
|
5daf15ac2d
|
Spaceserver agent list, broadcast routines for discovered agents
|
2012-11-21 11:12:40 -08:00 |
|
Philip Rosedale
|
2cf25c23c5
|
Spaceserver agent list, broadcast routines for discovered agents
|
2012-11-21 11:12:40 -08:00 |
|
Philip Rosedale
|
3ddea45e2c
|
Added spaceserver messaging.
|
2012-11-20 21:51:09 -08:00 |
|
Philip Rosedale
|
e64f46d556
|
Added spaceserver messaging.
|
2012-11-20 21:51:09 -08:00 |
|
Philip Rosedale
|
86b1f0909b
|
More little housekeeping cleanups to main.cpp
|
2012-11-19 15:20:24 -08:00 |
|
Philip Rosedale
|
c91dd5c4c2
|
More little housekeeping cleanups to main.cpp
|
2012-11-19 15:20:24 -08:00 |
|
Philip Rosedale
|
17cccf7617
|
Removed cloud rendering from main.cpp to Cloud class
|
2012-11-19 15:07:21 -08:00 |
|
Philip Rosedale
|
6a7128243a
|
Removed cloud rendering from main.cpp to Cloud class
|
2012-11-19 15:07:21 -08:00 |
|
Yoz Grahame
|
5536f539b0
|
use glDrawElements() to draw the particles - no major speedup so far, but less code
|
2012-11-19 13:18:37 -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
|
2bc588f4d0
|
Merge branch 'master' of git://github.com/worklist/interface
Conflicts:
main.cpp
|
2012-11-19 12:56:38 -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
|
cb52fb7f04
|
Removing some of the triangle code in main.cpp
|
2012-11-18 11:00:21 -08:00 |
|
Philip Rosedale
|
95b106b867
|
Removing some of the triangle code in main.cpp
|
2012-11-18 11:00:21 -08:00 |
|
Philip Rosedale
|
4174364adc
|
Further work on Cloud class
|
2012-11-18 10:45:41 -08:00 |
|
Philip Rosedale
|
125eed350a
|
Further work on Cloud class
|
2012-11-18 10:45:41 -08:00 |
|
Philip Rosedale
|
86d9230181
|
Partial commit to switch sprite rendering to new Cloud class
|
2012-11-17 17:00:56 -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
|
672f48c08f
|
Head tweaks, audio toggle
|
2012-11-16 16:45:44 -08:00 |
|
Philip Rosedale
|
13344f1774
|
Head tweaks, audio toggle
|
2012-11-16 16:45:44 -08:00 |
|
Yoz Grahame
|
4b5f25fafa
|
Lock build SDK to 10.7
|
2012-11-12 17:48:45 -08:00 |
|
Yoz Grahame
|
1f6134b14b
|
Lock build SDK to 10.7
|
2012-11-12 17:48:45 -08:00 |
|
Yoz Grahame
|
b774d833e4
|
Texture loading only happens at init()
|
2012-11-12 17:48:28 -08:00 |
|
Yoz Grahame
|
c604a88a07
|
Texture loading only happens at init()
|
2012-11-12 17:48:28 -08:00 |
|
Philip Rosedale
|
ee0c614482
|
Merge branch 'master' of github.com:/worklist/interface
|
2012-11-12 17:32:42 -08:00 |
|
Philip Rosedale
|
ee1db09d06
|
Merge branch 'master' of github.com:/worklist/interface
|
2012-11-12 17:32:42 -08:00 |
|
Philip Rosedale
|
15dd6cafbd
|
Work in progress on field/ball interaction
|
2012-11-12 17:31:07 -08:00 |
|
Philip Rosedale
|
7dbac3fbc9
|
Work in progress on field/ball interaction
|
2012-11-12 17:31:07 -08:00 |
|
Yoz Grahame
|
7c63f09254
|
Merge pull request #5 from yozlet/master
Fix missing textures
|
2012-11-12 17:29:09 -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
|
adb373180f
|
Oops - texture load command went missing in a merge
|
2012-11-12 17:27:39 -08:00 |
|
Yoz Grahame
|
0206086ade
|
Oops - texture load command went missing in a merge
|
2012-11-12 17:27:39 -08:00 |
|
Philip Rosedale
|
d168cb1610
|
Trivial change to test
|
2012-11-09 18:02:39 -08:00 |
|
Philip Rosedale
|
642c81beae
|
Trivial change to test
|
2012-11-09 18:02:39 -08:00 |
|
Yoz Grahame
|
c43da6687a
|
Merge pull request #4 from yozlet/master
Merging 2d pointer fix
|
2012-11-09 15:55:00 -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 |
|