fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1592 Commits
1 Branch
0 Tags
227 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ec4fc9da24'
${ noResults }
Commit Graph

142 Commits (ec4fc9da24bf40f023f28740064d61a29f99168f)

Author SHA1 Message Date
Fan-Wu Yang 3956affa01 removed timescale, and merged master
8 years ago
Fan-Wu Yang 6003bdf771 Fixed issue where finishing boats order could be be changed
8 years ago
Fan-Wu Yang 4ddc369dbc Changed Collisions, and merged master
8 years ago
hba56 05d9eeae01 Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary
8 years ago
hba56 6187b83524 Merge remote-tracking branch 'origin/ac35_map_boundary' into ac35_map_boundary
8 years ago
hba56 58cde8ce44 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
8 years ago
Joseph e434af0728 fixed boat collisions. Increased boat collision radius 15 -> 50
8 years ago
Connor Taylor-Brown f2a0f56cf0 Merge remote-tracking branch 'remotes/origin/boat_speed_issue_54' into ac35_map_boundary
8 years ago
hba56 1783e73caf color fix for first leg
8 years ago
fjc40 e77208aea1 MarkRoundingSequence now stores data using the leg number, rather than the leg object itself. This was an issue as leg objects would be recreated when race xml files are received.
8 years ago
fjc40 abfa3ea863 Race now uses a 1 for timescale, which effectively disables time/speed scaling.
8 years ago
David Wu 3adc5330b4 Merge branch 'master' into story1292_hp_punish
8 years ago
fjc40 46192af628 Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes).
8 years ago
Connor Taylor-Brown 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp
8 years ago
Fan-Wu Yang bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang b550afcca7 Merged race scaling with Http Match Discovery.
8 years ago
Connor Taylor-Brown 7eb59cdcfc Allowed fractional health deductions per frame
8 years ago
Connor Taylor-Brown 50d5dd02a2 BoatState message can be received from mock by visualiser
8 years ago
fjc40 db27d673de Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff.
8 years ago
Fan-Wu Yang 928f5e31f0 Hopefully final version of Hosting #story[1188]
8 years ago
fjc40 424cd63c59 Should fix the race xml issues where boats get unassigned sometimes.
8 years ago
fjc40 191f249bfb Speed scale is 2, rather than 10.
8 years ago
Connor Taylor-Brown 90c258e9e9 Reset collision tag on visualiser boat after displaying collision
8 years ago
fjc40 d29a47ec23 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
fjc40 2ad947b57d The start time of the race is no longer scaled by the race speed scalar.
8 years ago
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
fjc40 a1684a410c Javadoc.
8 years ago
fjc40 9fa1b9ee67 Re-enabled source id allocator check.
8 years ago
fjc40 3fa6b9200d Finished MarkRoundingSequence class. Added MarkRoundingData class.
8 years ago
Connor Taylor-Brown 01a304efb9 Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
Connor Taylor-Brown fbd124e602 Merge branch 'master' into storyB-)
8 years ago
Jessica Syder 108643b59d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
fjc40 346aa148ef Added some debug statements, and WIP MarkRoundingSequence class.
8 years ago
hba56 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago
Jessica Syder a5d3434a70 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
fjc40 ec82e65ae7 Fixed javadocs in xml creation classes.
8 years ago
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
8 years ago
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
cbt24 a6db06a82c Boats now reverse smoothly when colliding
8 years ago
cbt24 b62344261a Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
Joseph Gardner 00cedf4d4d TackGybeCommand now smooths the rotation of the boat. #story[1196]
8 years ago
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
8 years ago
cbt24 3ecf203cba Recovered stable rotation of the player's boat
8 years ago
Joseph f4cb1a3ac4 Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196]
8 years ago
fjc40 361856ea1d Updated timescale.
8 years ago
fjc40 16bf57e333 javadoc fixes.
8 years ago
fjc40 8c76d6c26e Added boats.xml schema.
8 years ago