 Calum
|
3d7a64068f
|
Fixed scaling issues.
#fix
|
2017-09-25 23:19:03 +13:00 |
|
|
Calum
|
c12f7408ad
|
experimenting with map scaling
#implement
|
2017-09-25 22:57:45 +13:00 |
|
|
Calum
|
35b50d1436
|
Refactored 2d game view distance calculations to better size and sale the map,
#implement #refactor #story[1275]
|
2017-09-25 21:06:18 +13:00 |
|
|
Calum
|
9b00ba654a
|
Added a race importer. Added imported races to visualizer. Made it so that the host sets the race. Refactored server to no longer be dependant on a specific race. Tested functionality of map manually. Some bugs found and listed below.
#implement #testmanual #story[1275]
Known bugs:
* Can't move
* Map is off center in lobby view.
* 3D Map is off center
|
2017-09-23 22:45:53 +12:00 |
|
|
Calum
|
6ca75b2cac
|
Changed default race
|
2017-09-21 15:08:39 +12:00 |
|
|
Calum
|
40a7f9bc5b
|
New server creation view created. Added templates for custom races. Updated xml generator to remove all hard coded values. Updated XMLParser to parse custom race files. No unit tests exists currently.
#implement #story[1275]
|
2017-09-21 12:59:37 +12:00 |
|
|
Calum
|
da263355f4
|
Changed raceview background.
#fix
|
2017-09-19 14:55:26 +12:00 |
|
|
Calum
|
ebecd25ed2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-09-19 14:54:15 +12:00 |
|
|
Calum
|
0f5137c2b6
|
Fixed the orientation of .stl files.
#fix
|
2017-09-19 14:52:02 +12:00 |
|
 Kusal Ekanayake
|
73799954e4
|
Fixed tests that failed when running on lower end computers. Needed to add a couple of thread.sleeps
|
2017-09-15 12:47:40 +12:00 |
|
 Haoming Yin
|
edfeb2b287
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
sprint_7.1
|
2017-09-14 15:40:26 +12:00 |
|
|
Haoming Yin
|
0355784000
|
Broadcast messages when boats pass legs or a token is picked up or expired.
tags: #story[1250] #pair[hyi25, zyt10]
|
2017-09-14 15:40:12 +12:00 |
|
 Alistair McIntyre
|
02df69b7b4
|
- Merged Dev into branch
Tags: #story[1245]
sprint_7.0
|
2017-09-14 15:27:10 +12:00 |
|
|
Alistair McIntyre
|
242132b800
|
Merge remote-tracking branch 'origin/develop' into NewUI_merge
# Conflicts:
# src/main/resources/views/RaceView.fxml
|
2017-09-14 15:26:57 +12:00 |
|
|
Alistair McIntyre
|
3a671d4ed0
|
- Added Values to Finish Dialog.
Tags: #story[1245]
|
2017-09-14 15:24:58 +12:00 |
|
|
Alistair McIntyre
|
482d987839
|
- Fixed Null Pointer
- Build Should pass
Tags: #story[1245]
|
2017-09-14 15:10:48 +12:00 |
|
|
Haoming Yin
|
cc124b2d19
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
|
2017-09-14 14:50:49 +12:00 |
|
|
Haoming Yin
|
b3320ad805
|
Fixed server message sender
tags: #story[1246]
|
2017-09-14 14:49:25 +12:00 |
|
|
Alistair McIntyre
|
33779ad5c1
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
# Conflicts:
# src/main/resources/views/RaceView.fxml
|
2017-09-14 14:42:57 +12:00 |
|
|
Alistair McIntyre
|
3a41c27d8d
|
- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.
tags : #story[1245]
|
2017-09-14 14:42:25 +12:00 |
|
|
Calum
|
e24203904b
|
Removed print statements.
#chore
|
2017-09-14 14:37:22 +12:00 |
|
|
Calum
|
eb188495ce
|
Fixed position issues on exit arrows.
#implement #story[1266] #fix
|
2017-09-14 14:32:45 +12:00 |
|
|
Calum
|
62a7e2b8fa
|
Fixed position issues on entry arrows.
#implement #story[1266] #fix
|
2017-09-14 14:21:04 +12:00 |
|
 Michael Rausch
|
acd0e790fe
|
Added method to send server debug messages to players
Tags: #story[1246]
|
2017-09-14 14:14:21 +12:00 |
|
 Zhi You Tan
|
46013474c0
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-14 13:37:01 +12:00 |
|
|
Alistair McIntyre
|
bf427f24d3
|
- Created a Race Finish Dialog.
tags : #story[1245]
|
2017-09-14 13:34:48 +12:00 |
|
|
Alistair McIntyre
|
7d0a47446d
|
- Fixed bug in customize dialog.
tags : #story[1245]
|
2017-09-14 13:02:31 +12:00 |
|
|
Alistair McIntyre
|
889098bb50
|
- Commented out broken test (non-deterministic thing)
- Merged 3d factory branch in
tags : #story[1245]
|
2017-09-14 12:46:17 +12:00 |
|
|
Alistair McIntyre
|
6223a8fc0b
|
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
|
2017-09-14 12:40:20 +12:00 |
|
|
Calum
|
391bd33548
|
Fixed position issues on first 2 mark arrows.
#implement #story[1266]
|
2017-09-14 12:38:36 +12:00 |
|
|
Alistair McIntyre
|
7e0c2abbfd
|
- Fixed a shutdown bug that left the game process running long after the window shut
- Changed SVG Icon for volume toggle to something a bit nicer
tags : #story[1245]
|
2017-09-14 12:31:49 +12:00 |
|
|
Calum
|
42a5e86bf8
|
Merge remote-tracking branch 'origin/NewUI_merge' into story1266_3d_model_factory
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
|
2017-09-14 12:06:19 +12:00 |
|
|
Calum
|
20d73d8f2f
|
Removed dead code from fxObjects and GameView 3D
#chore
|
2017-09-14 12:05:20 +12:00 |
|
|
Calum
|
0a62c538ca
|
Added 3D mark arrows and cleaned up other classes.
|
2017-09-14 11:28:50 +12:00 |
|
|
Zhi You Tan
|
24a04aa530
|
Fix the wind direction arrow rotation.
#story[1245]
|
2017-09-14 01:05:52 +12:00 |
|
|
Haoming Yin
|
7ee6a09626
|
Fixed that wind speed did not updated frequently and UI polishing.
- added shadow for raceview boxes
- split up message history and input text block
- changed timer font
#story[1245]
|
2017-09-13 21:11:40 +12:00 |
|
 Zhi You Tan
|
47798b19fe
|
Added player position, boat speed, boat heading to race view.
#story[1245]
|
2017-09-13 11:22:05 +12:00 |
|
|
Zhi You Tan
|
d9247eb031
|
Added player position, boat speed, boat heading to race view.
#story[1245]
|
2017-09-13 11:21:33 +12:00 |
|
|
Zhi You Tan
|
7b0d31438e
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge_ryan
|
2017-09-13 09:44:17 +12:00 |
|
|
Alistair McIntyre
|
1e74321aab
|
- Lobby Disconnection works.
tags : #story[1245]
|
2017-09-12 18:26:25 +12:00 |
|
|
Zhi You Tan
|
f0fc75feec
|
[WIP] Adding player position, boat speed, boat heading
#story[1245]
|
2017-09-12 18:25:46 +12:00 |
|
|
Kusal Ekanayake
|
c8dc448a52
|
Added tests for sounds and modified the transparency for the chat history window.
#story[1245]
|
2017-09-12 18:11:32 +12:00 |
|
|
Michael Rausch
|
e518d13fd5
|
Fixed bug where number of players was off by 1
#story[1247]
|
2017-09-12 17:47:02 +12:00 |
|
|
Alistair McIntyre
|
167545cbef
|
- Deleted old controllers that didn't do anything anymore.
tags : #story[1245]
|
2017-09-12 17:45:39 +12:00 |
|
|
Alistair McIntyre
|
20b656b16d
|
- Fixed a bug in new customize dialog.
- Chat should work correctly when pressing enter now.
tags : #story[1245]
|
2017-09-12 17:26:52 +12:00 |
|
|
Alistair McIntyre
|
90a54beb8d
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-12 17:19:29 +12:00 |
|
|
Alistair McIntyre
|
e375efb8e9
|
- Added documentation to controllers
- Moved Customization Dialog logic into LobbyController
tags : #story[1245]
|
2017-09-12 17:19:18 +12:00 |
|
|
Michael Rausch
|
06e9c55d2c
|
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
|
2017-09-12 17:17:46 +12:00 |
|
|
Michael Rausch
|
9cba76f979
|
Fixed maven source encoding
|
2017-09-12 17:17:16 +12:00 |
|
|
Calum
|
d5ce61a0ff
|
Merge branch 'NewUI_merge' into story1266_3d_model_factory
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
|
2017-09-12 17:09:47 +12:00 |
|