timokoesters
|
fb0b0f682a
|
Fix duplicated code
Former-commit-id: 3096669413032d1bdb43cb349c333948e497b538
|
2019-04-25 22:59:11 +02:00 |
|
Joshua Barretto
|
f1b63732af
|
Merge branch 'master' into 'master'
Terrain
Closes #5
See merge request veloren/veloren!66
Former-commit-id: 01d1eb1e0aaae62d0c2a53390fd847db524d217e
|
2019-04-25 19:35:35 +00:00 |
|
Forest Anderson
|
cabb06717b
|
Merge branch 'show-mouse-esc' into 'master'
Show mouse on Esc, hide when pressing again
Closes #28
See merge request veloren/veloren!61
Former-commit-id: 37d5792a563f4cce2f2c9f13d3d46cf098caf27f
|
2019-04-25 18:27:08 +00:00 |
|
Joshua Barretto
|
f136a63f69
|
Adjusted terrain loading and meshing performance
Former-commit-id: b55800b559289bf925d56096f29c0cfbc22439d2
|
2019-04-25 17:52:11 +01:00 |
|
Joshua Barretto
|
0b0c71592c
|
Fixed orientation issue
Former-commit-id: 9fdeadb4c9a9ff55cbdeccbbf97ac32b4e9f4226
|
2019-04-25 17:52:11 +01:00 |
|
Joshua Barretto
|
9105bf0811
|
Added better terrain collisions
Former-commit-id: 38de44654d8050260a19a1da6c40c0f701602f13
|
2019-04-25 17:52:11 +01:00 |
|
Joshua Barretto
|
f210de09df
|
Added raycasting (needs testing) and basic character terrain collision
Former-commit-id: be6bfacfd28e777a64d8157fce129f8072e20b38
|
2019-04-25 17:52:11 +01:00 |
|
Joshua Barretto
|
61afb98869
|
Foobar
Former-commit-id: adac9eea1bd685a8eee275e5a05a74c287762e22
|
2019-04-25 17:52:11 +01:00 |
|
Joshua Barretto
|
f9f434a1c2
|
Started work on worldgen
Former-commit-id: 277a4b2a0a5a393c590a710aebaf62e5cce2ad1d
|
2019-04-25 17:52:11 +01:00 |
|
Louis Pearson
|
b0ebbd5631
|
Use the directory defined by the OS to store configuration files
Former-commit-id: 7735a27f088a8bd543bf812f1299500844140d4f
|
2019-04-25 10:24:00 -06:00 |
|
Joshua Barretto
|
7e1ef46e4d
|
Merge branch 'pfauenauge-fix' into 'master'
Update UI (Pfauenauge)
See merge request veloren/veloren!68
Former-commit-id: 43d549dbb8882937df929f618325163d22c919a4
|
2019-04-25 12:25:30 +00:00 |
|
Joshua Barretto
|
dc86b4d14e
|
Removed old commented logging code
Former-commit-id: 9b20f7b7a979de3377f1da84d46e23ddd0ef6c11
|
2019-04-25 13:08:47 +01:00 |
|
Joshua Barretto
|
abaab5787b
|
Made message output smaller
Former-commit-id: 21eee7126baf3f85468dc54c5e31cbb4deda9667
|
2019-04-25 13:08:46 +01:00 |
|
Joshua Barretto
|
03051248b9
|
Added user-friendly error output for Voxygen
Former-commit-id: 55952f32019e826863849f07a71695de3e0c4c3c
|
2019-04-25 13:08:46 +01:00 |
|
Joshua Barretto
|
d04db4f6dc
|
Merge branch 'master' into 'master'
velocity tilt, run adjustments
See merge request veloren/veloren!69
Former-commit-id: 90a449e76431bb11bf748b887876c0e88db9e566
|
2019-04-25 12:08:01 +00:00 |
|
Louis Pearson
|
2a6a0a2a3e
|
Fix default server loading
Former-commit-id: 2273a32327c5268e4f6d5cce97bd58792a385c71
|
2019-04-25 02:45:01 -06:00 |
|
Louis Pearson
|
feb0610448
|
Ran rustfmt on ui.rs
Former-commit-id: 7ee721023ce69de122993b9c94b0bd3fa739e154
|
2019-04-25 02:35:08 -06:00 |
|
Louis Pearson
|
d7e9caf5de
|
Adjust server list UI
Former-commit-id: 61587cbd540c71bc9c264a744b89b8d88ec7ac15
|
2019-04-25 02:35:08 -06:00 |
|
Louis Pearson
|
dadbfb9d85
|
Add clickable server buttons
Former-commit-id: d56b65b83db590991a2a42a95caa7b41a216052c
|
2019-04-25 02:35:08 -06:00 |
|
Louis Pearson
|
d7c80d0afc
|
Add basic UI to view saved servers
Former-commit-id: 85cc946ac3684aaba64a03997790ef5ab06dbbd7
|
2019-04-25 02:35:08 -06:00 |
|
Louis Pearson
|
15c2cdb2ef
|
Add networksettings and integrate with main menu ui
Former-commit-id: f04532e03f8262b9751ae4a68259637f7de0344c
|
2019-04-25 02:35:08 -06:00 |
|
timokoesters
|
e36ca0bc59
|
Fix unnecessary if
Former-commit-id: 303b140a06045a7eb3406402d5e30480571a713d
|
2019-04-25 10:27:18 +02:00 |
|
jshipsey
|
c0a8a677b7
|
simplified scaling code
Former-commit-id: 9e35a57ea812f1446958daac2ccd4c3492d19347
|
2019-04-24 23:33:36 -04:00 |
|
jshipsey
|
0a34bfab9b
|
run animation incremental tweaks
Former-commit-id: fa43d89890e22da665dc29606baed46e23f8eb6e
|
2019-04-24 23:32:35 -04:00 |
|
jshipsey
|
bc5074a2b8
|
velocity tilt
Former-commit-id: 362232bff35784828ee8766e77dadc4e83bf3753
|
2019-04-24 23:31:18 -04:00 |
|
jshipsey
|
56a8a247cc
|
simplified scaling code
Former-commit-id: 2a1c8450f002862f67873c375674413902e138ef
|
2019-04-24 23:30:06 -04:00 |
|
jshipsey
|
9c15fa08a8
|
run animation incremental tweaks
Former-commit-id: 3abad8762a7a2daaf96c955cf89bcf5713ae7318
|
2019-04-24 23:28:51 -04:00 |
|
jshipsey
|
9510edd148
|
velocity tilt
Former-commit-id: 34443765d993ec5036d2b3e08e7dff5a68193de6
|
2019-04-24 23:26:22 -04:00 |
|
jshipsey
|
97603120a2
|
simplified scaling code
Former-commit-id: 3f85bf6aef1f3931570fafb8b2aa5b0dc26f8fad
|
2019-04-24 23:25:05 -04:00 |
|
jshipsey
|
4d0660affb
|
run animation incremental tweaks
Former-commit-id: c80f014baf3b9ddb73bb01cf6fd83272d890ab55
|
2019-04-24 23:25:05 -04:00 |
|
jshipsey
|
df39bcb2dc
|
velocity tilt
Former-commit-id: 7373827734c9a65813537d7a1cb49b400c7d6fb8
|
2019-04-24 23:25:05 -04:00 |
|
timokoesters
|
a981d57379
|
Fix formatting
Former-commit-id: 5fd593a918f22d02b2c5be246c81ef1e8042ad69
|
2019-04-24 22:33:34 +02:00 |
|
timokoesters
|
8314fc9439
|
Update UI
Former-commit-id: 644483e15f2d4db6ab2400ffe4fb202729769217
|
2019-04-24 21:55:22 +02:00 |
|
Forest Anderson
|
f85e3546cf
|
Merge branch 'fps_counter' into 'master'
Add debug window, window toggle, fps counter
See merge request veloren/veloren!63
Former-commit-id: 38e5d85a0db9a01c877f975f91526cd2dbe1c1fb
|
2019-04-23 17:57:49 +00:00 |
|
sxv20_
|
0127cae5d0
|
remove TODO comment
Former-commit-id: cd90cd0403d03b6c8c9477a7377ad25288cc1488
|
2019-04-23 18:36:29 +01:00 |
|
timokoesters
|
701755a8e2
|
Add disconnect handling
Former-commit-id: 24a9d535101f28debc0fe5a0600a32c9b744466f
|
2019-04-23 14:01:16 +02:00 |
|
timokoesters
|
7baecff1f0
|
Clean up figure cache models when necessary
Former-commit-id: 7653217b2f4c02f5c179e35907fa47c3526b2a2e
|
2019-04-23 13:59:16 +02:00 |
|
timokoesters
|
3bb7de61ef
|
Fix .internal()
Former-commit-id: 63207ee9bdc1fa31dcff0c5ad93c6a71857fe165
|
2019-04-22 23:00:25 +02:00 |
|
timokoesters
|
e9027c6433
|
Split connecting from registering
Former-commit-id: 56c21f72bc5b53635d6fdf00c99eb34df3b448c9
|
2019-04-22 23:00:24 +02:00 |
|
timokoesters
|
ba6ead4077
|
More wrong messages will be punished with disconnect
Former-commit-id: 767f3226c62d7560d26a909eed8a69b8afe11110
|
2019-04-22 23:00:23 +02:00 |
|
timokoesters
|
794b9cafad
|
Implement ClientStates
Former-commit-id: f6167fd6de6fd1a3309224409cac77193be982e2
|
2019-04-22 23:00:22 +02:00 |
|
timokoesters
|
802c484a38
|
Make character model more variable
Former-commit-id: 331baad40c79d846290c4617ea8e359b2786c7ef
|
2019-04-22 23:00:21 +02:00 |
|
sxv20_
|
ded36d7c8d
|
Add debug window, debug window toggle
Former-commit-id: f0eee8c127dab7c6f552e00ca26632fe1798ee5d
|
2019-04-22 20:24:54 +01:00 |
|
sxv20_
|
64c97f47fc
|
Add prototype FPS counter to HUD
Former-commit-id: c75778ff22ddd44d6e398a559193bc0d0c2e62fe
|
2019-04-22 20:24:16 +01:00 |
|
timokoesters
|
f8d1340199
|
Show mouse on Esc, hide when pressing again
Former-commit-id: 440fd99b32b2490cb87add2e095cdd17fece0b57
|
2019-04-22 20:23:40 +02:00 |
|
timokoesters
|
91057edfac
|
Remove .internal and .internal_mut
Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2
|
2019-04-22 10:24:27 +02:00 |
|
jshipsey
|
44374969fb
|
Merge branch 'master' of https://gitlab.com/jshipsey/fresh
Former-commit-id: ba8dfe2c6b54b40b25ce2fe71d2eef8827f8a779
|
2019-04-20 19:39:54 -04:00 |
|
jshipsey
|
c492e72a99
|
tidying up code
Former-commit-id: 0f77e7baf0c628969bc31e4d5fc4b42e18ab57d2
|
2019-04-20 19:37:09 -04:00 |
|
jshipsey
|
7778546b69
|
more rebasing
Former-commit-id: f8671bbddd1c8aae132f1888bb76262aa5f81bcf
|
2019-04-20 19:34:40 -04:00 |
|
jshipsey
|
0e71756643
|
merge fix
Former-commit-id: 38fa38de2b2985062e3260170b4f6f06d17515a1
|
2019-04-20 19:28:18 -04:00 |
|