Forest Anderson
|
96114e07de
|
Added nightly stuff
Former-commit-id: aaadaf472219d061d9c43503bf8fea1a0a6207e9
|
2019-04-25 09:06:37 -04:00 |
|
Forest Anderson
|
d7dbda7876
|
Changed directory
Former-commit-id: d5c572f26bbed5c6c0afc043f106e849fdef401c
|
2019-04-24 15:20:48 -04:00 |
|
Forest Anderson
|
944bbdbecc
|
Removed current folder parameter
Former-commit-id: 507c856d9e06a74e8e8241091deb49439012c300
|
2019-04-24 15:13:03 -04:00 |
|
Forest Anderson
|
5ac49c15a3
|
Cleaned, other work
Former-commit-id: 5f76fa944db9bdaaaab14da628db36d82f3d4d5c
|
2019-04-24 14:47:03 -04:00 |
|
Forest Anderson
|
2fdd7fca32
|
Uncommented lots of the tasks
Former-commit-id: 21bc41fbcfe580c0465a0cfd0053569a1b59186f
|
2019-04-24 11:10:12 -04:00 |
|
Forest Anderson
|
3231541b3e
|
Remove alternate git pull script
Former-commit-id: d86577109ade759c86fc97b51b32803457382a80
|
2019-04-24 09:59:27 -04:00 |
|
Forest Anderson
|
fdd92fb5ac
|
Changed submodule update
Former-commit-id: 2d1ed2cb59065760d8338d8620cc94cb610dc01b
|
2019-04-24 09:49:38 -04:00 |
|
Forest Anderson
|
f6b7ebf847
|
Sync for checkout
Former-commit-id: 00aa003a897612a47b020a18270f5a4225b3d027
|
2019-04-24 09:44:34 -04:00 |
|
Forest Anderson
|
d0d3f2e9b8
|
Added image to clean code
Former-commit-id: 5f33b098b0f086d9ccf77acd028463027ef58482
|
2019-04-24 09:39:30 -04:00 |
|
Forest Anderson
|
303b3eb906
|
First try with new image
Former-commit-id: 0642ae8965a5f410445c62c9408059bf010986b8
|
2019-04-24 09:37:36 -04:00 |
|
Forest Anderson
|
eb1c6d623e
|
Change target location
Former-commit-id: 9726ae44e7c0c72db648ef2aad08784f115a48cb
|
2019-04-24 08:17:02 -04:00 |
|
Forest Anderson
|
a385e2a25d
|
Save target to cache
Former-commit-id: ddf1488dca4917e5cfae55002e0763dfbee1ad91
|
2019-04-24 08:06:26 -04:00 |
|
Forest Anderson
|
0ee552cb5a
|
Fixed before_script
Former-commit-id: ef3bd010fe8bdd8bbb4e9159e11109d5db42dce0
|
2019-04-23 14:48:03 -04:00 |
|
Forest Anderson
|
66a6db7add
|
Added before script submodule
Former-commit-id: fa51f02b4ff4d1e5f671363fc3978065fe8c9970
|
2019-04-23 14:38:54 -04:00 |
|
Forest Anderson
|
efe365c990
|
Added submodule properly
Former-commit-id: 7773a1ec2d670043cc26c6b154d2b848c15ebc2b
|
2019-04-23 14:08:34 -04:00 |
|
Forest Anderson
|
91223ef41a
|
Added gcc
Former-commit-id: d8dc7ac7a7a133f261531544010d9554c3b41b0e
|
2019-04-23 14:02:08 -04:00 |
|
Forest Anderson
|
a580d46820
|
Fixed source
Former-commit-id: 192c67bba4180fcf39e4e9c48b0a85323600f18c
|
2019-04-23 13:44:00 -04:00 |
|
Forest Anderson
|
af250ce03a
|
Added curl
Former-commit-id: 68bc6cb4acf734acf4b0e6ef5e8d5900e5e5f35a
|
2019-04-23 13:42:40 -04:00 |
|
Forest Anderson
|
7840519ba9
|
Basic Rust env
Former-commit-id: 563aa620deb71fce91de02c91595044da108ff90
|
2019-04-23 13:41:40 -04:00 |
|
Forest Anderson
|
5e063e27e6
|
Added basic build
Former-commit-id: 007bf0415461e597b52f7a126c9cc40fff8f8cfe
|
2019-04-21 09:10:05 -04:00 |
|
Joshua Barretto
|
0dca245a53
|
Merge branch 'master' into 'master'
animation tweaks
See merge request veloren/veloren!57
Former-commit-id: 070d47b4b3488a447523769169811cf25fb7a04b
|
2019-04-20 23:43:34 +00: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 |
|
jshipsey
|
a7f300feee
|
rebasing
Former-commit-id: 1ef4423a8f839f5c72c650dd0ba4affddc0215fa
|
2019-04-20 19:28:18 -04:00 |
|
jshipsey
|
9d2040d509
|
tidying up code
Former-commit-id: 43981525316728a182d41ecc107f31e2eb2583f9
|
2019-04-20 19:20:49 -04:00 |
|
jshipsey
|
6fd783e6eb
|
animation minor fixes
Former-commit-id: 38d2da587d647b7f0c08994bc9fe41cc2d7ab675
|
2019-04-20 19:20:48 -04:00 |
|
jshipsey
|
0137a83dd8
|
animattion tweaks
Former-commit-id: ea560ba0f06432d2d4f9d4f1906f77451a7f5ef7
|
2019-04-20 19:18:42 -04:00 |
|
jshipsey
|
78d7cfd89d
|
animation adjustments
Former-commit-id: d396ddadf4293212f9f6f7142de0d8a519e127d6
|
2019-04-20 19:18:42 -04:00 |
|
jshipsey
|
33411a6004
|
merge fix
Former-commit-id: 15da549d36774bb3713297d2b9f3799b1d7eb5f4
|
2019-04-20 19:13:38 -04:00 |
|
jshipsey
|
ab17221dad
|
adding test assets
Former-commit-id: 7d8f9b19d8ec1b31a67d3d650a9e64aa23fc741c
|
2019-04-20 19:13:38 -04:00 |
|
jshipsey
|
a04ddf67f6
|
quadruped testing
Former-commit-id: 07f4fb4484f26dae0e8503ddec32a17f2fa312b5
|
2019-04-20 19:13:38 -04:00 |
|
Joshua Barretto
|
0e812baf7f
|
Merge branch 'ui_improvements' into 'master'
Ui improvements
Closes #23
See merge request veloren/veloren!54
Former-commit-id: 227b25c971c2576e5121d884a5e102307dd471c3
|
2019-04-20 23:06:59 +00:00 |
|
jshipsey
|
357a035757
|
Merge branch 'master' of https://gitlab.com/jshipsey/fresh
Former-commit-id: 0b7dab49b7d7d92149b2873a8390ab699db63642
|
2019-04-20 18:57:09 -04:00 |
|
jshipsey
|
83f8759746
|
tidying up code
Former-commit-id: 062930589922dc903be9e959eb06fd203945c101
|
2019-04-20 18:52:34 -04:00 |
|
jshipsey
|
30e80bdfc3
|
animattion tweaks
Former-commit-id: 8e1b89a929761fee2a46aab4689a3dee72573eff
|
2019-04-20 18:47:46 -04:00 |
|
jshipsey
|
7717d12c7a
|
more rebasing
Former-commit-id: c38dde30d5ced7cefad40e3f4ae4208f412bdd23
|
2019-04-20 18:47:15 -04:00 |
|
jshipsey
|
c655790c8a
|
merge fix
Former-commit-id: a344856978c40e12d37dba5aaa0e0abac1dba9f4
|
2019-04-20 18:41:05 -04:00 |
|
jshipsey
|
164b9ee203
|
adding test assets
Former-commit-id: 9731a05a8b4bed89898513599f8689be5600bb0b
|
2019-04-20 18:41:05 -04:00 |
|
jshipsey
|
ee4a261a28
|
rebasing
Former-commit-id: 38e7f49fb503caa9ca2377ac48f8fb3a1b22301e
|
2019-04-20 18:37:09 -04:00 |
|
jshipsey
|
3d318a85e4
|
tidying up code
Former-commit-id: df86599ae47b71bb744f5589da4511fa71603541
|
2019-04-20 18:12:45 -04:00 |
|
jshipsey
|
46f571f99a
|
animation minor fixes
Former-commit-id: 4326db41103a0d3f87c7ad638fb38cd2f3eec71c
|
2019-04-20 18:08:56 -04:00 |
|
Imbris
|
7fa37e0c2a
|
update asset loading to not use env
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
|
2019-04-20 18:02:48 -04:00 |
|
jshipsey
|
60fa9a7e20
|
animattion tweaks
Former-commit-id: 0baf418a09bfa8ffad7a0bfe4b9f5256053454fb
|
2019-04-20 17:33:51 -04:00 |
|
Dominik Broński
|
d4002262e9
|
Fix fonts Issue
Former-commit-id: ce4e6d4d0d42a48489585f208a9267b7b6aa88e6
|
2019-04-20 20:48:35 +00:00 |
|
Joshua Barretto
|
2142cf3c02
|
Merge branch 'constisfuture' into 'master'
make 11.0 a const
Closes #26
See merge request veloren/veloren!55
Former-commit-id: 29e54e5546dee739a8dfb86c9d51c18afccfd9ea
|
2019-04-20 18:51:35 +00:00 |
|
Piotr
|
2800c9e9f5
|
make 11.0 a const
Former-commit-id: 4602f3147b434e93256d48938b813325e74ad551
|
2019-04-20 20:35:45 +02:00 |
|
Imbris
|
d6d4155fc4
|
rearrange hud event handling slighlty
Former-commit-id: 8043d6c6197112123c371258407ea886a5ae3595
|
2019-04-20 14:08:39 -04:00 |
|
Imbris
|
67584a49ce
|
hide chat input when not typing
Former-commit-id: a1982ef2edf991c94cea359a2892cbf13ef8e980
|
2019-04-20 11:43:38 -04:00 |
|