Commit graph

960 commits

Author SHA1 Message Date
Thomas Fischer
e7a4d61772 Merge pull request #894 from Winterleaf/Dev---Volume.cpp
Added Sanity Check for out of memory
2014-11-17 18:03:21 +01:00
Thomas Fischer
469fe3afa7 Merge pull request #758 from eightyeight/meshroad_physics_collision
Implemented physics collision for MeshRoad
2014-11-17 17:45:00 +01:00
Areloch
b5ce3fa8ad Merge pull request #903 from Winterleaf/MissionMarker
Looks good, don't see any problems. Merged.
2014-11-13 21:48:58 -06:00
Daniel Buckmaster
895cf59500 Merge pull request #890 from Winterleaf/Dev-depthSortList.cpp
Minor Improvement to depthSortList.cpp
2014-11-12 09:52:50 +11:00
Daniel Buckmaster
1f0209db78 Merge pull request #917 from jamesu/fix_audio_print
Fix bug where console stack was incorrectly used to print audio devices
2014-11-12 09:37:16 +11:00
Daniel Buckmaster
c354f59b72 Merge pull request #922 from eightyeight/fix-http-post
Make HTTPObject::post work
2014-11-08 15:35:32 +11:00
Daniel Buckmaster
697dbb13b3 Make HTTPObject::post work. 2014-11-08 15:34:15 +11:00
James Urquhart
20acbfed04 Fix late night coding issue 2014-11-08 00:14:56 +00:00
James Urquhart
0e87023e46 Fix problem with formatting 2014-11-08 00:01:01 +00:00
James Urquhart
d041cbbb7a Fix bug where console stack was incorrectly used to print audio devices 2014-11-07 23:54:08 +00:00
Daniel Buckmaster
3082bb3adc Merge pull request #884 from GarageGames/development-3.6
Version 3.6.2
2014-11-05 20:28:01 +11:00
Vincent Gee
fbc9660bc3 WaypointTeam never worked and if you look at the code you can see its not very clean. 2014-11-04 20:14:50 -05:00
Vincent Gee
a849202bde Added Sanity Check for out of memory 2014-11-04 06:49:09 -05:00
Vincent Gee
f348313413 Minor Improvement to depthSortList.cpp 2014-11-04 06:18:24 -05:00
Daniel Buckmaster
9e4446046f Merge pull request #710 from lukaspj/3-Textures-Blending-Fix
3 textures blending fix
2014-11-04 17:06:04 +11:00
Daniel Buckmaster
97ae3445c9 Merge pull request #793 from lukaspj/Terrain-Basetex-Formats
Terrain basetex formats
2014-11-04 14:54:08 +11:00
Daniel Buckmaster
be75d5eaab Merge pull request #886 from eightyeight/fix-postfx-manager
Reduce minimum tab width in PostFX manager
2014-11-04 14:20:03 +11:00
Daniel Buckmaster
719fcd7d2d Reduce minimum tab width in PostFX manager. 2014-11-04 14:16:32 +11:00
Daniel Buckmaster
ed820f2dd4 Merge pull request #761 from J0linar/PostFx_Vignette
Added Vignette PostFx
2014-11-04 13:30:47 +11:00
Daniel Buckmaster
3902ebb861 Merge pull request #883 from eightyeight/update-readme-and-version
Update readme and version
2014-11-04 11:56:39 +11:00
Daniel Buckmaster
e2435e39d0 Update README with new links and version number. 2014-11-04 11:12:21 +11:00
Daniel Buckmaster
dc92d58692 Update version.h 2014-11-04 11:12:15 +11:00
Daniel Buckmaster
a61be8783a New Physics doc group. 2014-11-04 11:12:13 +11:00
Daniel Buckmaster
2f1d787b13 Merge pull request #868 from GarageGames/contributing-doc
Contributing doc
2014-11-04 11:03:39 +11:00
Daniel Buckmaster
1e47b7bf44 Mention code style guidelines. 2014-11-02 08:04:12 +11:00
Daniel Buckmaster
a8f246404a Merge pull request #879 from eightyeight/issue-825
Increment vertex pointer by 3, not 1
2014-11-02 07:56:51 +11:00
Daniel Buckmaster
8de36576cd Merge pull request #880 from eightyeight/issue-180
Improve documentation on getCursorPos and fix cursorInControl
2014-11-02 07:55:24 +11:00
Daniel Buckmaster
378a933894 Merge pull request #690 from rextimmy/bullet_282
Bullet Physics Library 2.82 update
2014-11-02 07:54:48 +11:00
Daniel Buckmaster
f6d54d810b Improve documentation on getCursorPos and fix cursorInControl. 2014-11-02 07:51:03 +11:00
Daniel Buckmaster
d12310602d Increment vertex pointer by 3, not 1. 2014-11-02 07:35:39 +11:00
Daniel Buckmaster
278c621f22 Re-add unit testing module
During the move from the project manager repo, the testing
module definition appears to have disappeared. It's back now.
2014-10-31 13:02:31 +11:00
Daniel Buckmaster
153d611bcd Merge pull request #878 from eightyeight/issue-98
Prevent crash when loading Player with no shape
2014-10-31 10:07:29 +11:00
Daniel Buckmaster
a87a891cfc Prevent crash when loading Player with no shape. 2014-10-31 10:04:32 +11:00
Daniel Buckmaster
b97c4eff6c Merge pull request #875 from eightyeight/fix-tsshape-bounds-collision
Use existing methods instead of incorrect maths
2014-10-31 09:21:41 +11:00
Daniel Buckmaster
e209cc4389 Use existing methods instead of incorrect maths. 2014-10-31 09:11:07 +11:00
Daniel Buckmaster
644225db92 Merge pull request #874 from eightyeight/enable-gamepad-earlier
Enable gamepad input when the startup GUI wakes
2014-10-31 08:25:37 +11:00
Daniel Buckmaster
f3b08501c0 Enable gamepad input when the startup GUI wakes. 2014-10-31 08:07:19 +11:00
Daniel Buckmaster
72c25dda60 Merge pull request #843 from eightyeight/move-projects-xml
Added projects.xml from Project Manager
2014-10-29 09:22:09 +11:00
Daniel Buckmaster
ef9bc91bff Merge pull request #744 from lukaspj/Ribbon-Implementation
Ribbon and RibbonNode
2014-10-28 15:19:17 +11:00
Daniel Buckmaster
74e328d09b Merge pull request #870 from eightyeight/fix-ear-transform
Andrew's fix for ear transform with detached camera
2014-10-28 14:39:09 +11:00
Daniel Buckmaster
b88d3fde1f Merge pull request #829 from jamesu/namespace_link
Add console function to link namespaces
2014-10-28 14:12:46 +11:00
Daniel Buckmaster
889d5122cc Merge pull request #871 from eightyeight/set-position
Added a setPosition function
2014-10-28 14:11:15 +11:00
Daniel Buckmaster
19f91fee2b Added a setPosition function. 2014-10-28 14:10:22 +11:00
Daniel Buckmaster
e02e542717 Merge pull request #749 from lukaspj/MixedParticleRendering
Re-enable Mixed particle rendering
2014-10-28 09:50:02 +11:00
Daniel Buckmaster
355ce5d854 Andrew's fix for ear transform with detached camera. 2014-10-28 09:26:46 +11:00
Daniel Buckmaster
a1b985e64d Merge pull request #869 from eightyeight/fix-tsfuncrefactor
Fix omissions in astNodes.cpp
2014-10-28 09:13:44 +11:00
Daniel Buckmaster
a4f7182de5 Fix omissions in astNodes.cpp. 2014-10-28 08:55:17 +11:00
Daniel Buckmaster
fd93397e5d Merge pull request #846 from Azaezel/guiobjectview
guiobjectview corrections
2014-10-27 17:28:58 +11:00
Daniel Buckmaster
8e1a323e18 Fixed typos. 2014-10-27 17:25:26 +11:00
Daniel Buckmaster
d73ddc5d77 Create CONTRIBUTING.md 2014-10-27 17:22:50 +11:00